Skip to content

Commit 0ffc1d4

Browse files
committed
move cygwin paths from actions into test
1 parent 43ddda3 commit 0ffc1d4

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ jobs:
195195
- name: Configure CMake
196196
run: >-
197197
export PATH=/usr/bin:$(cygpath ${SYSTEMROOT})/system32 &&
198-
cmake . -B build -DCMAKE_C_FLAGS="-Wall -Wextra -Werror -pedantic" -DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror -pedantic" -DDEP_INSTALL_PREFIX="/usr/local" -DDEP_BUILD_THREADS=2 -DDEP_USE_JEMALLOC=Off
198+
cmake . -B build -DCMAKE_C_FLAGS="-Wall -Wextra -Werror -Wpedantic" -DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror -Wpedantic" -DDEP_INSTALL_PREFIX="/usr/local" -DDEP_BUILD_THREADS=2 -DDEP_USE_JEMALLOC=Off
199199
shell: "C:\\cygwin\\bin\\bash.exe -o igncr -eo pipefail {0}"
200200

201201
- name: Build
@@ -207,6 +207,6 @@ jobs:
207207
- name: Test
208208
# https://cygwin.com/pipermail/cygwin/2005-May/133368.html
209209
run: >-
210-
export PATH=/usr/bin:/usr/local/sqlite3-pcre:$(cygpath ${SYSTEMROOT})/system32 &&
210+
export PATH=$(cygpath ${SYSTEMROOT})/system32 &&
211211
ctest --output-on-failure --test-dir build
212212
shell: "C:\\cygwin\\bin\\bash.exe -o igncr -eo pipefail {0}"

test/regression/os_specific.sh.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@
6262

6363

6464
# source this file instead of using it as a command to only check OS once
65+
case "@CMAKE_SYSTEM_NAME@" in
66+
"CYGWIN")
67+
export PATH="@DEP_INSTALL_PREFIX@/sqlite3-pcre:${PATH}"
68+
;;
69+
esac
70+
6571
# shellcheck disable=SC2034,SC2194,SC2215
6672
case "@CMAKE_SYSTEM_NAME@" in
6773
"APPLE" | "Darwin")

0 commit comments

Comments
 (0)