Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .github/workflows/build_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -894,15 +894,6 @@ jobs:
_build/tests/cobol85/**/*.out
_build/tests/cobol85/**/duration.txt

- name: Adjust testsuite
run: |
rem Skip test as it sometimes works and sometimes not...
rem %MSYS_BASH% -lc "sed -i '/used_binaries/{N;/temporary path invalid/{N;N;N;N;s/traceon/traceon; echo \"workflow:1\">\"$at_check_line_file\"; at_fn_check_skip 77/;}}' tests/testsuite"

rem Change to expected fail if there's an error specific to the CI that we don't want to change
rem in the testsuite for expected result (should normally only be a temporary thing)
rem sed -i '/run_fundamental/{N;/Compare FLOAT-LONG with floating-point literal/{N;s/at_xfail=no/at_xfail=yes/;}}' tests/testsuite

Comment on lines -897 to -905

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That just doesn't do anything (same as before)... if possible I'd like to keep it in (but commenting out the step completely) in case we need to ignore something for some time on Win32 (for example during longer development of a feature/fix where "works outside of Windows" is something we may even commit upstream)

(same applies to the change in the other workflow)

- name: Run testsuite
run: |
rem To work around regular hangs we run NIST first, then the internal
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/windows-msys2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
# command it provides, to workaround a diff bug under the MSYS2 CI ;
# this no longer seems necessary today
# PATH="$PATH:/c/Program Files/Git/usr/bin"
../configure $CFGOPT CFLAGS=-std=c17
../configure $CFGOPT CFLAGS=-std=gnu17 LDFLAGS=-lintl

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still would like to understand what we need LDFLAGS=-lintl for - and if we can set that to something more specific (the global ones will "leak" into cobc calls).


- name: Upload config.log
if: ${{ !cancelled() }}
Expand Down Expand Up @@ -185,12 +185,6 @@ jobs:
_build/tests/cobol85/**/*.out
_build/tests/cobol85/**/duration.txt

- name: Adjust testsuite
shell: msys2 {0}
run: |
# Skip test as it sometimes works and sometimes not...
# sed -i '/used_binaries/{N;/temporary path invalid/{N;N;N;N;s/traceon/traceon; echo "workflow:1">"$at_check_line_file"; at_fn_check_skip 77/;}}' tests/testsuite

- name: Run testsuite
shell: msys2 {0}
run: |
Expand Down
Loading