Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
carenas committed Jun 9, 2024
1 parent fc70a2d commit 316710a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,12 @@ jobs:
run: cmake --build build

- name: Test
continue-on-error: true
run: |
cd build\Debug
..\..\RunTest.bat
./pcre2posix_test -v
cd build
ctest -C Debug .
- name: Debug
if: steps.Tests.outcome == 'failure'
run: |
type build/Testing/Temporary/LastTest.log
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1058,18 +1058,15 @@ if test \"$?\" != \"0\"; then exit 1; fi
# Provide environment for executing the bat file version of RunTest
FILE(TO_NATIVE_PATH ${PROJECT_SOURCE_DIR} winsrc)
FILE(TO_NATIVE_PATH ${PROJECT_BINARY_DIR} winbin)
FILE(TO_NATIVE_PATH ${PCRE2TEST_EXE} winexe)

FILE(WRITE ${PROJECT_BINARY_DIR}/pcre2_test.bat
"\@REM This is a generated file.
\@echo off
setlocal
SET srcdir=\"${winsrc}\"
# The next line was replaced by the following one after a user comment.
# SET pcre2test=\"${winexe}\"
SET pcre2test=\"${winbin}\\pcre2test.exe\"
if not [%CMAKE_CONFIG_TYPE%]==[] SET pcre2test=\"${winbin}\\%CMAKE_CONFIG_TYPE%\\pcre2test.exe\"
call %srcdir%\\RunTest.Bat
call %srcdir%\\RunTest.bat
if errorlevel 1 exit /b 1
echo RunTest.bat tests successfully completed
")
Expand Down
6 changes: 3 additions & 3 deletions RunTest.bat
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
@rem Tidied and updated for new tests 21, 22, 23 by PH, October 2015.
@rem PH added missing "set type" for test 22, April 2016.
@rem PH added copy command for new testbtables file, November 2020
@rem PH caused it to show comparison output when comparison faile, July 2023
@rem PH updated unknown error number in test
@rem PH caused it to show comparison output when comparison failed, July 2023
@rem PH updated unknown error number in test


setlocal enabledelayedexpansion
Expand Down Expand Up @@ -139,7 +139,7 @@ if "%all%" == "yes" (
set do9=yes
set do10=no
set do11=yes
set do12=no
set do12=yes
set do13=yes
set do14=yes
set do15=yes
Expand Down

0 comments on commit 316710a

Please sign in to comment.