Treat "msys" as Windows for test exit statuses. [skip ci]

As far as it was possible to tell in GH pull request #653, exit statuses
have the same semantics in "msys" as they do in "MSWin32".  Although
other OS-specific parts of TESTrun may require including or excluding
"msys" too, this would need to be established by running a current
revision of the script on the actual system.

diff --git a/CHANGES b/CHANGES
index 34f4878e5fbd0161fb8ac7be7051ee6fed90de7f..0a7a3084526c1dda62c3e1c8bc54bc1cc3b8dba2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,8 @@ Monthday, Month DD, YYYY by gharris and denis
       Introduce new ND_LCHECK*() macros to deduplicate more code.
       IEEE 802.11: Simplify handle_action().
       RPKI-Router: Refine length and bounds checks.
       Introduce new ND_LCHECK*() macros to deduplicate more code.
       IEEE 802.11: Simplify handle_action().
       RPKI-Router: Refine length and bounds checks.

+    Building and testing:
+      Treat "msys" as Windows for test exit statuses.

 
 TBD
   Summary for 4.99.2 tcpdump release: (so far)
 
 TBD
   Summary for 4.99.2 tcpdump release: (so far)

diff --git a/tests/TESTrun b/tests/TESTrun
index ca42a744efe5d9b29f5187819307ee1b358b710f..eddfacbc8522f8a05c108d9ac3e56b16cf7ac2cc 100755 (executable)
--- a/tests/TESTrun
+++ b/tests/TESTrun
@@ -121,7 +121,7 @@ sub runtest {
             $status = $!;
             printf OUTPUT "FAILED TO RUN: status: %d\n", $status;
         } else {
             $status = $!;
             printf OUTPUT "FAILED TO RUN: status: %d\n", $status;
         } else {

-            if ($^O eq 'MSWin32') {
+            if ($^O eq 'MSWin32' or $^O eq 'msys') {

                 #
                 # On Windows, the return value of system is the lower 8
                 # bits of the exit status of the process, shifted left
                 #
                 # On Windows, the return value of system is the lower 8
                 # bits of the exit status of the process, shifted left