helly Fri Dec 23 21:01:05 2005 EDT
Modified files:
/php-src Makefile.global run-tests.php
Log:
- Add make target make ntest to test in unicode mode
- Change make target test to check native and unicode mode
http://cvs.php.net/viewcvs.cgi/php-src/Makefile.global?r1=1.65&r2=1.66&diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.65 php-src/Makefile.global:1.66
--- php-src/Makefile.global:1.65 Tue Nov 22 00:51:24 2005
+++ php-src/Makefile.global Fri Dec 23 21:01:05 2005
@@ -77,7 +77,7 @@
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC="$(CC)" \
- $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1'
$(top_srcdir)/run-tests.php $(TESTS); \
+ $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1'
$(top_srcdir)/run-tests.php -U $(TESTS); \
else \
echo "ERROR: Cannot run tests without CLI sapi."; \
fi
@@ -92,6 +92,16 @@
echo "ERROR: Cannot run tests without CLI sapi."; \
fi
+ntest: all
+ [EMAIL PROTECTED] test -x $(SAPI_CLI_PATH) && test ! -z
$(SAPI_CLI_PATH); then \
+ TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+ TEST_PHP_SRCDIR=$(top_srcdir) \
+ CC="$(CC)" \
+ $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1'
$(top_srcdir)/run-tests.php -N $(TESTS); \
+ else \
+ echo "ERROR: Cannot run tests without CLI sapi."; \
+ fi
+
clean:
find . -name \*.gcno -o -name \*.gcda | xargs rm -f
find . -name \*.lo -o -name \*.o | xargs rm -f
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.266&r2=1.267&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.266 php-src/run-tests.php:1.267
--- php-src/run-tests.php:1.266 Fri Dec 23 19:40:01 2005
+++ php-src/run-tests.php Fri Dec 23 21:01:05 2005
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.266 2005/12/23 19:40:01 helly Exp $ */
+/* $Id: run-tests.php,v 1.267 2005/12/23 21:01:05 helly Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -323,6 +323,10 @@
}
$pass_option_n = true;
break;
+ case 'N':
+ $unicode_and_native = false;
+ $unicode_testing = false;
+ break;
case 'q':
putenv('NO_INTERACTION=1');
break;
@@ -382,7 +386,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.266 $'."\n";
+ echo '$Revision: 1.267 $'."\n";
exit(1);
default:
echo "Illegal switch specified!\n";
@@ -417,6 +421,8 @@
-m Test for memory leaks with Valgrind.
+ -N Test with unicode_semantics set off.
+
-s <file> Write output to <file>.
-q Quite, no user interaction (same as environment
NO_INTERACTION).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
