xxx

OCamlPro · Mar 14, 2024 · 07c37bd · 07c37bd
1 parent 5d52d5e
commit 07c37bd
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/tests/testsuite.src/used_binaries.at b/tests/testsuite.src/used_binaries.at
@@ -373,7 +373,8 @@ AT_DATA([prog.cob], [
 ])
 
 AT_CHECK([TMPDIR="" TMP="notthere" TEMP="" $COMPILE prog.cob 2> compiler.output], [0], [],
-[ignore],[
+[],[
+    # On Windows, we get a failure from gcc, so the binary is not created, the stderr is mixed and exit code is 1.
     AT_CHECK([grep libcob: compiler.output], [0], [libcob: warning: Temporary directory TMP is invalid, adjust TMPDIR!])
   ],
   [
@@ -382,9 +383,15 @@ AT_CHECK([TMPDIR="" TMP="notthere" TEMP="" $COMPILE prog.cob 2> compiler.output]
     AT_CHECK([$COBCRUN_DIRECT ./prog], [0], [OK], [])
   ])
 
-AT_CHECK([TMPDIR="" TMP="" TEMP="./prog.cob" $COMPILE prog.cob], [0], [],
-[libcob: warning: Temporary directory TEMP is invalid, adjust TMPDIR!
+AT_CHECK([TMPDIR="" TMP="" TEMP="./prog.cob" $COMPILE prog.cob 2> compiler.output], [0], [],
+[],[
+    AT_CHECK([grep libcob: compiler.output], [0], [libcob: warning: Temporary directory TEMP is invalid, adjust TMPDIR!])
+  ],
+  [
+    AT_CHECK([cat compiler.output], [0], [libcob: warning: Temporary directory TEMP is invalid, adjust TMPDIR!
 ])
+  ])
+
 # TMPDIR is only checked when actually needed which is currently only the case
 # for SORT
 #AT_CHECK([TMPDIR="./prog.cob" $COBCRUN_DIRECT ./prog], [0], [OK],
@@ -1055,6 +1062,9 @@ AT_CHECK([$COBC -fdiagnostics-plain-output -fdiagnostics-show-caret -Wno-others
 
 AT_CHECK([$COMPILE -fdiagnostics-absolute-paths -Wall prog.cob 2> compiler.output], [1])
 
+AT_CHECK([echo "s|$PWD|HOME|" > pwd.output])
+AT_CAPTURE_FILE([pwd.output])
+
 AT_CHECK([$SED -e "s|$PWD|HOME|" compiler.output], [0],
 [HOME/prog.cob:7: error: CRUD.CPY: No such file or directory
 HOME/prog.cob:6: warning: numeric value is expected