From 650bdb51fd4a2be92243693f74065131464c6e5b Mon Sep 17 00:00:00 2001
From: Marcus Boerger <helly@php.net>
Date: Fri, 23 Dec 2005 21:01:05 +0000
Subject: [PATCH] - Add make target make ntest to test in unicode mode - Change
 make target test to check native and unicode mode

---
 Makefile.global | 12 +++++++++++-
 run-tests.php   |  6 ++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Makefile.global b/Makefile.global
index a98d80bf11..93f751a010 100644
--- 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 87b61f824c..c85fed8552 100755
--- 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).
-- 
2.40.0