mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-25 12:23:09 +00:00
d83ef07ca7
This adds the new builtin 'string' which supports various string manipulation and matching algorithms, including PCRE based regular expressions. Fixes #2296 Squashed commit of the following: commit 4c3eaeb6e57d76463e9683c327142b0aeafb92b8 Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:51:30 2015 -0700 Remove testdata and doc dirs from pcre2 source commit b2a8b4b50f2398b204fb72cfe4b5ba77ece2e1ab Merge:11c8a47
7974aab
Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:32:40 2015 -0700 Merge branch 'string' of git://github.com/msteed/fish-shell into string-test commit7974aab6d3
Author: Michael Steed <msteed@saltstack.com> Date: Fri Sep 11 13:00:02 2015 -0600 build pcre2 lib only, no docs commiteb20b43d2d
Merge:1a09e70
5f519cb
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 20:00:47 2015 -0600 Merge branch 'string' of github.com:msteed/fish-shell into string commit1a09e709d0
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:58:24 2015 -0600 rebase on master & address the fallout commita0ec9772cd
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit64c25a01e3
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commitece7f35ec5
Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit9ff7477a92
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commitbaf4e096b2
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit896a2c2b27
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commitefd47dcbda
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commited0850e2db
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit9492e7a7e9
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit1a60b93371
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in commit5f519cb2a2
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit2ecd24f795
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit45b777e4dc
Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit981cbb6ddf
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commitddb6a2a8fd
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit1e34e3191b
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit34232e152d
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit00d7e78169
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit4498aa5f57
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit290c58c72e
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in
463 lines
12 KiB
Batchfile
463 lines
12 KiB
Batchfile
@echo off
|
|
@rem
|
|
@rem MS Windows batch file to run pcre2test on testfiles with the correct
|
|
@rem options. This file must use CRLF linebreaks to function properly,
|
|
@rem and requires both pcre2test and pcre2grep.
|
|
@rem
|
|
@rem ------------------------ HISTORY ----------------------------------
|
|
@rem This file was originally contributed to PCRE1 by Ralf Junker, and touched
|
|
@rem up by Daniel Richard G. Tests 10-12 added by Philip H.
|
|
@rem Philip H also changed test 3 to use "wintest" files.
|
|
@rem
|
|
@rem Updated by Tom Fortmann to support explicit test numbers on the command
|
|
@rem line. Added argument validation and added error reporting.
|
|
@rem
|
|
@rem Sheri Pierce added logic to skip feature dependent tests
|
|
@rem tests 4 5 9 15 and 18 require utf support
|
|
@rem tests 6 7 10 16 and 19 require ucp support
|
|
@rem 11 requires ucp and link size 2
|
|
@rem 12 requires presence of jit support
|
|
@rem 13 requires absence of jit support
|
|
@rem Sheri P also added override tests for study and jit testing
|
|
@rem Zoltan Herczeg added libpcre16 support
|
|
@rem Zoltan Herczeg added libpcre32 support
|
|
@rem -------------------------------------------------------------------
|
|
@rem
|
|
@rem The file was converted for PCRE2 by PH, February 2015.
|
|
|
|
|
|
setlocal enabledelayedexpansion
|
|
if [%srcdir%]==[] (
|
|
if exist testdata\ set srcdir=.)
|
|
if [%srcdir%]==[] (
|
|
if exist ..\testdata\ set srcdir=..)
|
|
if [%srcdir%]==[] (
|
|
if exist ..\..\testdata\ set srcdir=..\..)
|
|
if NOT exist %srcdir%\testdata\ (
|
|
Error: echo distribution testdata folder not found!
|
|
call :conferror
|
|
exit /b 1
|
|
goto :eof
|
|
)
|
|
|
|
if [%pcre2test%]==[] set pcre2test=.\pcre2test.exe
|
|
|
|
echo source dir is %srcdir%
|
|
echo pcre2test=%pcre2test%
|
|
|
|
if NOT exist %pcre2test% (
|
|
echo Error: %pcre2test% not found!
|
|
echo.
|
|
call :conferror
|
|
exit /b 1
|
|
)
|
|
|
|
%pcre2test% -C linksize >NUL
|
|
set link_size=%ERRORLEVEL%
|
|
%pcre2test% -C pcre2-8 >NUL
|
|
set support8=%ERRORLEVEL%
|
|
%pcre2test% -C pcre2-16 >NUL
|
|
set support16=%ERRORLEVEL%
|
|
%pcre2test% -C pcre2-32 >NUL
|
|
set support32=%ERRORLEVEL%
|
|
%pcre2test% -C unicode >NUL
|
|
set unicode=%ERRORLEVEL%
|
|
%pcre2test% -C jit >NUL
|
|
set jit=%ERRORLEVEL%
|
|
|
|
if %support8% EQU 1 (
|
|
if not exist testout8 md testout8
|
|
if not exist testoutjit8 md testoutjit8
|
|
)
|
|
|
|
if %support16% EQU 1 (
|
|
if not exist testout16 md testout16
|
|
if not exist testoutjit16 md testoutjit16
|
|
)
|
|
|
|
if %support16% EQU 1 (
|
|
if not exist testout32 md testout32
|
|
if not exist testoutjit32 md testoutjit32
|
|
)
|
|
|
|
set do1=no
|
|
set do2=no
|
|
set do3=no
|
|
set do4=no
|
|
set do5=no
|
|
set do6=no
|
|
set do7=no
|
|
set do8=no
|
|
set do9=no
|
|
set do10=no
|
|
set do11=no
|
|
set do12=no
|
|
set do13=no
|
|
set do14=no
|
|
set do15=no
|
|
set do16=no
|
|
set do17=no
|
|
set do18=no
|
|
set do19=no
|
|
set all=yes
|
|
|
|
for %%a in (%*) do (
|
|
set valid=no
|
|
for %%v in (1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19) do if %%v == %%a set valid=yes
|
|
if "!valid!" == "yes" (
|
|
set do%%a=yes
|
|
set all=no
|
|
) else (
|
|
echo Invalid test number - %%a!
|
|
echo Usage %0 [ test_number ] ...
|
|
echo Where test_number is one or more optional test numbers 1 through 19, default is all tests.
|
|
exit /b 1
|
|
)
|
|
)
|
|
set failed="no"
|
|
|
|
if "%all%" == "yes" (
|
|
set do1=yes
|
|
set do2=yes
|
|
set do3=yes
|
|
set do4=yes
|
|
set do5=yes
|
|
set do6=yes
|
|
set do7=yes
|
|
set do8=yes
|
|
set do9=yes
|
|
set do10=yes
|
|
set do11=yes
|
|
set do12=yes
|
|
set do13=yes
|
|
set do14=yes
|
|
set do15=yes
|
|
set do16=yes
|
|
set do17=yes
|
|
set do18=yes
|
|
set do19=yes
|
|
)
|
|
|
|
@echo RunTest.bat's pcre2test output is written to newly created subfolders
|
|
@echo named testout{8,16,32} and testoutjit{8,16,32}.
|
|
@echo.
|
|
|
|
set mode=
|
|
set bits=8
|
|
|
|
:nextMode
|
|
if "%mode%" == "" (
|
|
if %support8% EQU 0 goto modeSkip
|
|
echo.
|
|
echo ---- Testing 8-bit library ----
|
|
echo.
|
|
)
|
|
if "%mode%" == "-16" (
|
|
if %support16% EQU 0 goto modeSkip
|
|
echo.
|
|
echo ---- Testing 16-bit library ----
|
|
echo.
|
|
)
|
|
if "%mode%" == "-32" (
|
|
if %support32% EQU 0 goto modeSkip
|
|
echo.
|
|
echo ---- Testing 32-bit library ----
|
|
echo.
|
|
)
|
|
if "%do1%" == "yes" call :do1
|
|
if "%do2%" == "yes" call :do2
|
|
if "%do3%" == "yes" call :do3
|
|
if "%do4%" == "yes" call :do4
|
|
if "%do5%" == "yes" call :do5
|
|
if "%do6%" == "yes" call :do6
|
|
if "%do7%" == "yes" call :do7
|
|
if "%do8%" == "yes" call :do8
|
|
if "%do9%" == "yes" call :do9
|
|
if "%do10%" == "yes" call :do10
|
|
if "%do11%" == "yes" call :do11
|
|
if "%do12%" == "yes" call :do12
|
|
if "%do13%" == "yes" call :do13
|
|
if "%do14%" == "yes" call :do14
|
|
if "%do15%" == "yes" call :do15
|
|
if "%do16%" == "yes" call :do16
|
|
if "%do17%" == "yes" call :do17
|
|
if "%do18%" == "yes" call :do18
|
|
if "%do19%" == "yes" call :do19
|
|
:modeSkip
|
|
if "%mode%" == "" (
|
|
set mode=-16
|
|
set bits=16
|
|
goto nextMode
|
|
)
|
|
if "%mode%" == "-16" (
|
|
set mode=-32
|
|
set bits=32
|
|
goto nextMode
|
|
)
|
|
|
|
@rem If mode is -32, testing is finished
|
|
if %failed% == "yes" (
|
|
echo In above output, one or more of the various tests failed!
|
|
exit /b 1
|
|
)
|
|
echo All OK
|
|
goto :eof
|
|
|
|
:runsub
|
|
@rem Function to execute pcre2test and compare the output
|
|
@rem Arguments are as follows:
|
|
@rem
|
|
@rem 1 = test number
|
|
@rem 2 = outputdir
|
|
@rem 3 = test name use double quotes
|
|
@rem 4 - 9 = pcre2test options
|
|
|
|
if [%1] == [] (
|
|
echo Missing test number argument!
|
|
exit /b 1
|
|
)
|
|
|
|
if [%2] == [] (
|
|
echo Missing outputdir!
|
|
exit /b 1
|
|
)
|
|
|
|
if [%3] == [] (
|
|
echo Missing test name argument!
|
|
exit /b 1
|
|
)
|
|
|
|
set testinput=testinput%1
|
|
set testoutput=testoutput%1
|
|
if exist %srcdir%\testdata\win%testinput% (
|
|
set testinput=wintestinput%1
|
|
set testoutput=wintestoutput%1
|
|
)
|
|
|
|
echo Test %1: %3
|
|
%pcre2test% %mode% %4 %5 %6 %7 %8 %9 %srcdir%\testdata\%testinput% >%2%bits%\%testoutput%
|
|
if errorlevel 1 (
|
|
echo. failed executing command-line:
|
|
echo. %pcre2test% %mode% %4 %5 %6 %7 %8 %9 %srcdir%\testdata\%testinput% ^>%2%bits%\%testoutput%
|
|
set failed="yes"
|
|
goto :eof
|
|
)
|
|
|
|
set type=
|
|
if [%1]==[8] (
|
|
set type=-%bits%
|
|
)
|
|
if [%1]==[11] (
|
|
set type=-%bits%
|
|
)
|
|
if [%1]==[12] (
|
|
set type=-%bits%
|
|
)
|
|
|
|
fc /n %srcdir%\testdata\%testoutput%%type% %2%bits%\%testoutput% >NUL
|
|
|
|
if errorlevel 1 (
|
|
echo. failed comparison: fc /n %srcdir%\testdata\%testoutput% %2%bits%\%testoutput%
|
|
if [%1]==[2] (
|
|
echo.
|
|
echo ** Test 2 requires a lot of stack. PCRE2 can be configured to
|
|
echo ** use heap for recursion. Otherwise, to pass Test 2
|
|
echo ** you generally need to allocate 8 mb stack to PCRE2.
|
|
echo ** See the 'pcre2stack' page for a discussion of PCRE2's
|
|
echo ** stack usage.
|
|
echo.
|
|
)
|
|
if [%1]==[3] (
|
|
echo.
|
|
echo ** Test 3 failure usually means french locale is not
|
|
echo ** available on the system, rather than a bug or problem with PCRE2.
|
|
echo.
|
|
goto :eof
|
|
)
|
|
|
|
set failed="yes"
|
|
goto :eof
|
|
)
|
|
|
|
echo. Passed.
|
|
goto :eof
|
|
|
|
:do1
|
|
call :runsub 1 testout "Main non-UTF, non-UCP functionality (Compatible with Perl >= 5.10)" -q
|
|
if %jit% EQU 1 call :runsub 1 testoutjit "Test with JIT Override" -q -jit
|
|
goto :eof
|
|
|
|
:do2
|
|
call :runsub 2 testout "API, errors, internals, and non-Perl stuff" -q
|
|
if %jit% EQU 1 call :runsub 2 testoutjit "Test with JIT Override" -q -jit
|
|
goto :eof
|
|
|
|
:do3
|
|
call :runsub 3 testout "Locale-specific features" -q
|
|
if %jit% EQU 1 call :runsub 3 testoutjit "Test with JIT Override" -q -jit
|
|
goto :eof
|
|
|
|
:do4
|
|
if %unicode% EQU 0 (
|
|
echo Test 4 Skipped due to absence of Unicode support.
|
|
goto :eof
|
|
)
|
|
call :runsub 4 testout "UTF-%bits% and Unicode property support - (Compatible with Perl >= 5.10)" -q
|
|
if %jit% EQU 1 call :runsub 4 testoutjit "Test with JIT Override" -q -jit
|
|
goto :eof
|
|
|
|
:do5
|
|
if %unicode% EQU 0 (
|
|
echo Test 5 Skipped due to absence of Unicode support.
|
|
goto :eof
|
|
)
|
|
call :runsub 5 testout "API, internals, and non-Perl stuff for UTF-%bits% and UCP" -q
|
|
if %jit% EQU 1 call :runsub 5 testoutjit "Test with JIT Override" -q -jit
|
|
goto :eof
|
|
|
|
:do6
|
|
call :runsub 6 testout "DFA matching main non-UTF, non-UCP functionality" -q -dfa
|
|
goto :eof
|
|
|
|
:do7
|
|
if %unicode% EQU 0 (
|
|
echo Test 7 Skipped due to absence of Unicode support.
|
|
goto :eof
|
|
)
|
|
call :runsub 7 testout "DFA matching with UTF-%bits% and Unicode property support" -q -dfa
|
|
goto :eof
|
|
|
|
:do8
|
|
if NOT %link_size% EQU 2 (
|
|
echo Test 8 Skipped because link size is not 2.
|
|
goto :eof
|
|
)
|
|
if %unicode% EQU 0 (
|
|
echo Test 8 Skipped due to absence of Unicode support.
|
|
goto :eof
|
|
)
|
|
call :runsub 8 testout "Internal offsets and code size tests" -q
|
|
goto :eof
|
|
|
|
:do9
|
|
if NOT %bits% EQU 8 (
|
|
echo Test 9 Skipped when running 16/32-bit tests.
|
|
goto :eof
|
|
)
|
|
call :runsub 9 testout "Specials for the basic 8-bit library" -q
|
|
if %jit% EQU 1 call :runsub 9 testoutjit "Test with JIT Override" -q -jit
|
|
goto :eof
|
|
|
|
:do10
|
|
if NOT %bits% EQU 8 (
|
|
echo Test 10 Skipped when running 16/32-bit tests.
|
|
goto :eof
|
|
)
|
|
if %unicode% EQU 0 (
|
|
echo Test 10 Skipped due to absence of Unicode support.
|
|
goto :eof
|
|
)
|
|
call :runsub 10 testout "Specials for the 8-bit library with Unicode support" -q
|
|
if %jit% EQU 1 call :runsub 10 testoutjit "Test with JIT Override" -q -jit
|
|
goto :eof
|
|
|
|
:do11
|
|
if %bits% EQU 8 (
|
|
echo Test 11 Skipped when running 8-bit tests.
|
|
goto :eof
|
|
)
|
|
call :runsub 11 testout "Specials for the basic 16/32-bit library" -q
|
|
if %jit% EQU 1 call :runsub 11 testoutjit "Test with JIT Override" -q -jit
|
|
goto :eof
|
|
|
|
:do12
|
|
if %bits% EQU 8 (
|
|
echo Test 12 Skipped when running 8-bit tests.
|
|
goto :eof
|
|
)
|
|
if %unicode% EQU 0 (
|
|
echo Test 12 Skipped due to absence of Unicode support.
|
|
goto :eof
|
|
)
|
|
call :runsub 12 testout "Specials for the 16/32-bit library with Unicode support" -q
|
|
if %jit% EQU 1 call :runsub 12 testoutjit "Test with JIT Override" -q -jit
|
|
goto :eof
|
|
|
|
:do13
|
|
if %bits% EQU 8 (
|
|
echo Test 13 Skipped when running 8-bit tests.
|
|
goto :eof
|
|
)
|
|
call :runsub 13 testout "DFA specials for the basic 16/32-bit library" -q -dfa
|
|
goto :eof
|
|
|
|
:do14
|
|
call :runsub 14 testout "Non-JIT limits and other non_JIT tests" -q
|
|
goto :eof
|
|
|
|
:do15
|
|
if %jit% EQU 1 (
|
|
echo Test 15 Skipped due to presence of JIT support.
|
|
goto :eof
|
|
)
|
|
call :runsub 15 testout "JIT-specific features when JIT is not available" -q
|
|
goto :eof
|
|
|
|
:do16
|
|
if %jit% EQU 0 (
|
|
echo Test 16 Skipped due to absence of JIT support.
|
|
goto :eof
|
|
)
|
|
call :runsub 16 testout "JIT-specific features when JIT is available" -q
|
|
goto :eof
|
|
|
|
:do17
|
|
if %bits% EQU 16 (
|
|
echo Test 17 Skipped when running 16-bit tests.
|
|
goto :eof
|
|
)
|
|
if %bits% EQU 32 (
|
|
echo Test 17 Skipped when running 32-bit tests.
|
|
goto :eof
|
|
)
|
|
call :runsub 17 testout "POSIX interface, excluding UTF-8 and UCP" -q
|
|
goto :eof
|
|
|
|
:do18
|
|
if %bits% EQU 16 (
|
|
echo Test 18 Skipped when running 16-bit tests.
|
|
goto :eof
|
|
)
|
|
if %bits% EQU 32 (
|
|
echo Test 18 Skipped when running 32-bit tests.
|
|
goto :eof
|
|
)
|
|
call :runsub 1 testout "POSIX interface with UTF-8 and UCP" -q
|
|
goto :eof
|
|
|
|
:do19
|
|
call :runsub 1 testout "Serialization tests" -q
|
|
goto :eof
|
|
|
|
:conferror
|
|
@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, pcre2_test.bat defines variables and automatically calls RunTest.bat.
|
|
@echo For manual testing of all available features, after configuring with cmake
|
|
@echo and building, you can run the built pcre2_test.bat. For best results with
|
|
@echo cmake builds and tests avoid directories with full path names that include
|
|
@echo spaces for source or build.
|
|
@echo.
|
|
@echo Otherwise, if the build dir is in a subdir of the source dir, testdata needed
|
|
@echo for input and verification should be found automatically when (from the
|
|
@echo location of the the built exes) you call RunTest.bat. By default RunTest.bat
|
|
@echo runs all tests compatible with the linked pcre2 library but it can be given
|
|
@echo a test number as an argument.
|
|
@echo.
|
|
@echo If the build dir is not under the source dir you can either copy your exes
|
|
@echo to the source folder or copy RunTest.bat and the testdata folder to the
|
|
@echo location of your built exes and then run RunTest.bat.
|
|
@echo.
|
|
goto :eof
|