Skip to content

Commit 7f1cd44

Browse files
committed
move cygwin paths from actions into test
1 parent 43ddda3 commit 7f1cd44

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 3 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
@@ -205,8 +205,7 @@ jobs:
205205
shell: "C:\\cygwin\\bin\\bash.exe -o igncr -eo pipefail {0}"
206206

207207
- name: Test
208-
# https://cygwin.com/pipermail/cygwin/2005-May/133368.html
209208
run: >-
210-
export PATH=/usr/bin:/usr/local/sqlite3-pcre:$(cygpath ${SYSTEMROOT})/system32 &&
209+
export PATH=/usr/bin:$(cygpath ${SYSTEMROOT})/system32 &&
211210
ctest --output-on-failure --test-dir build
212211
shell: "C:\\cygwin\\bin\\bash.exe -o igncr -eo pipefail {0}"

test/regression/os_specific.sh.in

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

6363

6464
# source this file instead of using it as a command to only check OS once
65+
66+
# shellcheck disable=SC2194
67+
case "@CMAKE_SYSTEM_NAME@" in
68+
"CYGWIN")
69+
# https://cygwin.com/pipermail/cygwin/2005-May/133368.html
70+
export PATH="@DEP_INSTALL_PREFIX@/sqlite3-pcre:${PATH}"
71+
;;
72+
esac
73+
6574
# shellcheck disable=SC2034,SC2194,SC2215
6675
case "@CMAKE_SYSTEM_NAME@" in
6776
"APPLE" | "Darwin")

0 commit comments

Comments
 (0)