- Add make target make ntest to test in unicode mode

- Change make target test to check native and unicode mode

diff --git a/Makefile.global b/Makefile.global
index a98d80bf11cd2cec73af2998d7f6b5d7b7d41804..93f751a010043c7fdef69b737af622fda785b536 100644 (file)
--- a/Makefile.global
+++ b/Makefile.global
@@ -77,7 +77,7 @@ test: all
                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 @@ utest: all
                echo "ERROR: Cannot run tests without CLI sapi."; \
        fi
 
+ntest: all
+       -@if 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

diff --git a/run-tests.php b/run-tests.php
index 87b61f824c8fb89fdee4cd1e780a20367a09e0ea..c85fed8552bd73ffa86789e1f96baee699dc2425 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -323,6 +323,10 @@ if (isset($argc) && $argc > 1) {
                                        }
                                        $pass_option_n = true;
                                        break;
+                               case 'N':
+                                       $unicode_and_native = false;
+                                       $unicode_testing = false;
+                                       break;
                                case 'q':
                                        putenv('NO_INTERACTION=1');
                                        break;
@@ -417,6 +421,8 @@ Options:
 
     -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).