Updated RunTest.bat (don't use JIT for tests 7-10).

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@791 2f5784b3-3f2a-0410-8824-cb99058d5e15

2 files changed, 9 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index bdd2619..226804c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -108,6 +108,8 @@ Version 8.21 05-Dec-2011
     "starts with" bytes for the pattern, the data written to the file (though 
     never used) was taken from uninitialized memory and so caused valgrind to
     complain.  
+    
+27. Updated RunTest.bat as provided by Sheri Pierce. 
 
 
 Version 8.20 21-Oct-2011
diff --git a/RunTest.bat b/RunTest.bat
index 5db979f..fabd477 100644
--- a/RunTest.bat
+++ b/RunTest.bat
@@ -18,6 +18,7 @@
 @rem 14 requires presense of jit support

 @rem 15 requires absence of jit support

 @rem Sheri P also added override tests for study and jit testing

+@rem JIT testing n/a for tests 7-10, removed JIT override test for them

 

 setlocal enabledelayedexpansion

 if [%srcdir%]==[] (

@@ -27,7 +28,7 @@ if exist ..\testdata\ set srcdir=..)
 if [%srcdir%]==[] (

 if exist ..\..\testdata\ set srcdir=..\..)

 if NOT exist "%srcdir%\testdata\" (

-Error: echo distribution testdata folder not found.

+Error: echo distribution testdata folder not found!

 call :conferror

 exit /b 1

 goto :eof

@@ -41,14 +42,14 @@ echo pcretest=%pcretest%
 echo pcregrep=%pcregrep%

 

 if NOT exist "%pcregrep%" (

-echo Error: "%pcregrep%" not found.

+echo Error: "%pcregrep%" not found!

 echo.

 call :conferror

 exit /b 1

 )

 

 if NOT exist "%pcretest%" (

-echo Error: "%pcretest%" not found.

+echo Error: "%pcretest%" not found!

 echo.

 call :conferror

 exit /b 1

@@ -219,7 +220,7 @@ if %jit% EQU 1 call :runsub 1 testoutjit "Test with JIT Override" -q -s+
 goto :eof

 

 :do2

-  call :runsub 2 testout "API, errors, internals, and non-Perl stuff" -q

+  call :runsub 2 testout "API, errors, internals, and non-Perl stuff (not UTF-8)" -q

   call :runsub 2 testoutstudy "Test with Study Override" -q -s

   if %jit% EQU 1 call :runsub 2 testoutjit "Test with JIT Override" -q -s+

 goto :eof

@@ -263,7 +264,6 @@ goto :eof
 :do7

   call :runsub 7 testout "DFA matching" -q -dfa

   call :runsub 7 testoutstudy "Test with Study Override" -q -dfa -s

-  if %jit% EQU 1 call :runsub 7 testoutjit "Test with JIT Override" -q -dfa -s+

 goto :eof

 

 :do8

@@ -273,7 +273,6 @@ goto :eof
 )

   call :runsub 8 testout "DFA matching with UTF-8" -q -dfa

   call :runsub 8 testoutstudy "Test with Study Override" -q -dfa -s

-  if %jit% EQU 1 call :runsub 8 testoutjit "Test with JIT Override" -q -dfa -s+

   goto :eof

 

 :do9

@@ -283,7 +282,6 @@ goto :eof
 )

   call :runsub 9 testout "DFA matching with Unicode properties" -q -dfa

   call :runsub 9 testoutstudy "Test with Study Override" -q -dfa -s

-  if %jit% EQU 1 call :runsub 9 testoutjit "Test with JIT Override" -q -dfa -s+

 goto :eof

 

 :do10

@@ -293,7 +291,6 @@ goto :eof
 )

   call :runsub 10 testout "Internal offsets and code size tests" -q

   call :runsub 10 testoutstudy "Test with Study Override" -q -s

-  if %jit% EQU 1 call :runsub 10 testoutjit "Test with JIT Override" -q -s+

 goto :eof

 

 :do11

@@ -342,7 +339,8 @@ goto :eof
 goto :eof

 

 :conferror

-@echo Configuration error.

+@echo.

+@echo Either your build is incomplete or you have a configuration error.

 @echo.

 @echo If configured with cmake and executed via "make test" or the MSVC "RUN_TESTS"

 @echo project, pcre_test.bat defines variables and automatically calls RunTest.bat.