Skip to content

Commit 264ef72

Browse files
authored
MSVC CI update
fix expected failures in Debug configs (catching SIGSEGV) additional: * provide config.log as that is used within the testsuite * adjusted atconfig per common builds
1 parent fb8f358 commit 264ef72

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

.github/workflows/windows-msvc.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,19 +162,21 @@ jobs:
162162
cd tests
163163
echo at_testdir=\'tests\' > atconfig
164164
echo abs_builddir=\'$(pwd)\' >> atconfig
165-
echo at_srcdir=\'./\' >> atconfig
166-
echo abs_srcdir=\'$(pwd)/\' >> atconfig
167-
echo at_top_srcdir=\'../\' >> atconfig
168-
echo abs_top_srcdir=\'$(pwd)/../\' >> atconfig
165+
echo at_srcdir=\'tests\' >> atconfig
166+
echo abs_srcdir=\'$(pwd)\' >> atconfig
167+
echo at_top_srcdir=\'..\' >> atconfig
168+
echo abs_top_srcdir=\'$(pwd)/..\' >> atconfig
169169
echo at_top_build_prefix=\'../\' >> atconfig
170-
echo abs_top_builddir=\'$(pwd)/../\' >> atconfig
170+
echo abs_top_builddir=\'$(pwd)/..\' >> atconfig
171171
echo at_top_builddir=\$at_top_build_prefix >> atconfig
172172
echo EXEEXT=\'.exe\' >> atconfig
173173
echo AUTOTEST_PATH=\'tests\' >> atconfig
174174
echo SHELL=\${CONFIG_SHELL-\'/bin/sh\'} >> atconfig
175175
echo m4_define\([AT_PACKAGE_STRING], [$GC_VERSION]\) > package.m4
176176
echo m4_define\([AT_PACKAGE_BUGREPORT], [bug-gnucobol@gnu.org]\) >> package.m4
177177
sed 's/x64\/Debug/${{ env.ARCHDIR }}\/${{ matrix.target }}/g' atlocal_win > atlocal
178+
echo "CI environmen MSVC: ${{ env.ARCHDIR }}\/${{ matrix.target }} configured." > ../config.log
179+
cat build_windows/config.h >> ../config.log
178180
autom4te --lang=autotest -I ./testsuite.src ./testsuite.at -o ./testsuite
179181
180182
# Fail tests that behave differently under MSVC Debug
@@ -190,12 +192,14 @@ jobs:
190192
# of the C runtime while the generated module is linked with the release version
191193
# CHECKME: cobc should use cl.exe /MTd and therefore all should use the debug runtime
192194
# - Internal storage: runtime checks abort before signal handler
195+
# - COB_SIGNAL_REGIME 0/1: runtime checks abort before signal handler
193196
- name: Adjust testsuite for Debug target
194197
if: ${{ matrix.target == 'Debug' }}
195198
shell: C:\shells\msys2bash.cmd {0}
196199
run: |
197200
sed -i '/run_extensions/{N;/System routine CBL_GC_HOSTED/{N;s/at_xfail=no/at_xfail=yes/;}}' tests/testsuite
198201
sed -i '/run_misc/{N;/write to internal storage (1)/{N;N;N;N;s/traceon/traceon; echo "workflow:1">"$at_check_line_file"; at_fn_check_skip 77/;}}' tests/testsuite
202+
sed -i '/run_misc/{N;/COB_SIGNAL_REGIME 0/{N;s/at_xfail=no/at_xfail=yes/;}}' tests/testsuite
199203
200204
- name: Run testsuite
201205
run: |

0 commit comments

Comments
 (0)