Merge SVN 5281

cobc/ChangeLog

@@ -1,4 +1,8 @@
 
+2024-06-19  David Declerck <[email protected]>
+
+	* cobc.c (process_compile): fix MSVC build command
+
 2024-05-15  Simon Sobisch <[email protected]>
 
 	* replace.c: fix compile warnings and formatting

cobc/cobc.c

@@ -8327,7 +8327,7 @@ process_compile (struct filename *fn)
 		"%s /c %s %s /Od /MDd /Zi /FR /c /Fa\"%s\" /Fo\"%s\" \"%s\"" :
 		"%s /c %s %s     /MD          /c /Fa\"%s\" /Fo\"%s\" \"%s\"",
 			cobc_cc, cobc_cflags, cobc_include, name,
-			name, fn->translate);
+			fn->object, fn->translate);
 	if (verbose_output > 1) {
 		return process (cobc_buffer);
 	} else {

tests/ChangeLog

@@ -6,6 +6,10 @@
 	  under MSVC Release, by forcing a flush of stdout with
 	  fflush and using cob_free instead of free in C codes
 
+2024-06-19  David Declerck <[email protected]>
+
+	* atlocal_win: fix path-related issues in Windows builds
+
 2023-07-10  Simon Sobisch <[email protected]>
 
 	* atlocal_win: updated to current atlocal.in
@@ -45,11 +49,6 @@
 	* testsuite.src/run_misc.at: fix linking/dlopen issue happening
 	  on some systems (mostly win32) in test CALL RETURNING POINTER
 
-2023-01-23 David Declerck <[email protected]>
-
-	* testsuite.src/configuration.at: test reading translation
-	  tables from an external file
-
 2023-01-21  Simon Sobisch <[email protected]>
 
 	* atlocal.in: prefer config.status replacement over environment var
@@ -102,16 +101,6 @@
 
 	* atlocal_valgrind, atlocal_win: updated to match atlocal.in
 
-2022-07-19  Nicolas Berthier <[email protected]>
-
-	* general: fix area A in testsuite
-
-2022-03-29  Nicolas Berthier <[email protected]>
-
-	* testsuite.src/configuration.at, testsuite.at/syn_misc.at: new
-	  tests for sections and paragraphs that do not end with a period
-	* testsuite.src/run_misc.at: fix lines in trace test
-
 2022-07-28  Simon Sobisch <[email protected]>
 
 	* atlocal.in: option to run part of the testsuite via perf -stat

tests/atlocal_win

@@ -86,8 +86,8 @@ _unset_option () {
 # Note: not needed for running the testsuite with MSYS as this translates the path
 #       if MSYS_NO_PATHCONV=1 is not set
 _return_path () {
-	if test "$OSTYPE" = "cygwin"; then
-		cygpath -pw "$1"
+	if test "$OSTYPE" = "cygwin" -o x$MSYSTEM_CHOST != x; then
+		cygpath -pm "$1"
 	else
 		# check for WSL / Bash on Windows; ignore error messages (file not available)
 		if $(grep -q "Microsoft" /proc/sys/kernel/osrelease 2>/dev/null); then