Skip to content

Commit a44e69d

Browse files
authored
Update windows-msvc.yml
test adjustments notes to dependencies
1 parent d28f9fa commit a44e69d

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

.github/workflows/windows-msvc.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,20 +177,26 @@ jobs:
177177
sed 's/x64\/Debug/${{ env.ARCHDIR }}\/${{ matrix.target }}/g' atlocal_win > atlocal
178178
autom4te --lang=autotest -I ./testsuite.src ./testsuite.at -o ./testsuite
179179
180-
- name: Adjust testsuite
181-
shell: C:\shells\msys2bash.cmd {0}
182-
run: |
183-
# sed -i '/AT_SETUP(\[runtime check: write to internal storage (1)\])/a AT_SKIP_IF(\[true\])' tests/testsuite.src/run_misc.at
184-
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
180+
#- name: Adjust testsuite
181+
# shell: C:\shells\msys2bash.cmd {0}
182+
# run: |
183+
# # sed -i '/AT_SETUP(\[runtime check: write to internal storage (1)\])/a AT_SKIP_IF(\[true\])' tests/testsuite.src/run_misc.at
184+
# 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
185185

186186
# Fail tests that behave differently under MSVC Debug
187187
# - System routine CBL_GC_HOSTED: fails because libcob is linked with the debug version
188188
# of the C runtime while the generated module is linked with the release version
189+
# CHECKME: cobc should use cl.exe /MTd and therefore all should use the debug runtime
190+
# - Internal storage: runtime checks abort before signal handler
191+
# - COB_SIGNAL_REGIME: runtime checks abort before signal handler
189192
- name: Adjust testsuite for Debug target
190193
if: ${{ matrix.target == 'Debug' }}
191194
shell: C:\shells\msys2bash.cmd {0}
192195
run: |
193196
sed -i '/run_extensions/{N;/System routine CBL_GC_HOSTED/{N;s/at_xfail=no/at_xfail=yes/;}}' tests/testsuite
197+
# sed -i '/AT_SETUP(\[runtime check: write to internal storage (1)\])/a AT_SKIP_IF(\[true\])' tests/testsuite.src/run_misc.at
198+
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
199+
sed -i '/run_misc/{N;/COB_SIGNAL_REGIME/{N;N;N;N;s/traceon/traceon; echo "workflow:1">"$at_check_line_file"; at_fn_check_skip 77/;}}' tests/testsuite
194200
195201
- name: Run testsuite
196202
run: |
@@ -210,9 +216,11 @@ jobs:
210216

211217
- name: Package GnuCOBOL and dependencies
212218
run: |
219+
rem for debug builds it should also package ucrtbased.dll and matching vcruntime*d.dll as those are commonly not available
213220
echo Export VCPKG dependencies
214221
vcpkg export %VCPKGS% --raw --output=export
215222
set VCPKG_EXPORT_DIR=%VCPKG_ROOT%\export
223+
rem this is currently broken (empty files)
216224
echo Wrap up VCPKG dependencies for separate download
217225
7z a -r -mx=9 dependencies-${{ matrix.arch }}-${{ matrix.target }}.7z "%VCPKG_EXPORT_DIR"
218226
echo Wrap up GnuCOBOL binary package

0 commit comments

Comments
 (0)