From 21dd1776b3f1185d220bac4b9c9c689d3072c00e Mon Sep 17 00:00:00 2001 From: Fabrice Le Fessant Date: Sat, 28 Oct 2023 11:03:30 +0200 Subject: [PATCH] xxx --- .github/workflows/windows.yml | 3 ++- tests/testsuite.src/used_binaries.at | 28 +++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 16224801c..3fcc8bfe3 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -79,15 +79,16 @@ jobs: path: _build/install.log - name: check - continue-on-error: true run: | cd _build/tests make check TESTSUITEFLAGS="--jobs=$(($(nproc)+1))" make test shell: msys2 {0} + - name: Upload testsuite.log uses: actions/upload-artifact@v3 + if: failure() with: name: testsuite.log path: _build/tests/testsuite.log diff --git a/tests/testsuite.src/used_binaries.at b/tests/testsuite.src/used_binaries.at index 7a9e781bc..2c404992d 100644 --- a/tests/testsuite.src/used_binaries.at +++ b/tests/testsuite.src/used_binaries.at @@ -1000,7 +1000,8 @@ AT_DATA([prog.cob], [ AT_CHECK([mkdir -p sub]) AT_DATA([COPY1.CPY], []) -AT_DATA([COPY2.CPY], [DISPLAY "Hello".]) +AT_DATA([COPY2.CPY], [ DISPLAY "Hello". +]) AT_DATA([sub/COPY3.CPY], []) AT_CHECK([$COMPILE_ONLY prog.cob]) @@ -1104,6 +1105,31 @@ AT_CHECK([$COMPILE_ONLY -M -MG prog.cob], [0], ]) +AT_DATA([prog.cob],[ + IDENTIFICATION DIVISION. + PROGRAM-ID. prog. + DATA DIVISION. + WORKING-STORAGE SECTION. + 01 BLA PIC X(5) VALUE 'bluBb'. + PROCEDURE DIVISION. + MAIN-PROC SECTION. + 00. + COPY PROC. + END-PROC SECTION. + COPY PROCE in "sub". + EX. + STOP RUN. +]) + +AT_CHECK([mkdir -p sub/copy], [0], [], []) + +AT_DATA([sub/copy/PROC.cpy],[ + DISPLAY BLA NO ADVANCING. +]) +AT_DATA([sub/PROCE.cpy],[ + DISPLAY ' END' NO ADVANCING. +]) + AT_CAPTURE_FILE([prog.d]) AT_CHECK([$COBC -I sub/copy prog.cob -ext=cpy -o prog.i -M -MP -MF prog.d -MT "prog.c prog.h" -MT prog$COB_EXE_EXT -MT prog.$COB_OBJECT_EXT -MT prog.i -fsyntax-only], [0], [], []) AT_CHECK([$GREP 'prog.c prog.h ' prog.d], [0], ignore, [])