Revision: 791
http://vcs.pcre.org/viewvc?view=rev&revision=791
Author: ph10
Date: 2011-12-07 16:38:03 +0000 (Wed, 07 Dec 2011)
Log Message:
-----------
Updated RunTest.bat (don't use JIT for tests 7-10).
Modified Paths:
--------------
code/trunk/ChangeLog
code/trunk/RunTest.bat
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2011-12-07 16:33:33 UTC (rev 790)
+++ code/trunk/ChangeLog 2011-12-07 16:38:03 UTC (rev 791)
@@ -108,6 +108,8 @@
"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
Modified: code/trunk/RunTest.bat
===================================================================
--- code/trunk/RunTest.bat 2011-12-07 16:33:33 UTC (rev 790)
+++ code/trunk/RunTest.bat 2011-12-07 16:38:03 UTC (rev 791)
@@ -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 [%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 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 @@
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 @@
: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 @@
)
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 @@
)
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 @@
)
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,8 +339,9 @@
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.
@echo For manual testing of all available features, after configuring with cmake
