xx-verify: since file 5.46 it expects Intel i386

Signed-off-by: CrazyMax <[email protected]>

Author: crazy-max

src/test-verify.bats

@@ -147,6 +147,11 @@ load 'assert'
   run xx-verify /idontexist
   assert_failure
 
+  export XX_VERIFY_FILE_CMD_OUTPUT=": PE32 executable (console) Intel i386 (stripped to external PDB), for MS Windows"
+  export TARGETPLATFORM=windows/386
+  run xx-verify /idontexist
+  assert_success
+
   export XX_VERIFY_FILE_CMD_OUTPUT=": PE32 executable (console) Intel 80386 (stripped to external PDB), for MS Windows"
   export TARGETPLATFORM=windows/386
   run xx-verify /idontexist
@@ -208,6 +213,11 @@ load 'assert'
   run xx-verify /idontexist
   assert_failure
 
+  export XX_VERIFY_FILE_CMD_OUTPUT=": ELF 32-bit LSB executable, Intel i386, version 1 (SYSV), statically linked, Go BuildID=GUb5psm2_Qmc_LlEF7GP/wcIHIg_4MjQh8NC5wfep/LSmTmWKKZ5smuAQbfeFE/FBYRjFmbJQpV--JKtz4i, not stripped"
+  export TARGETPLATFORM=linux/386
+  run xx-verify /idontexist
+  assert_success
+
   export XX_VERIFY_FILE_CMD_OUTPUT=": ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), statically linked, Go BuildID=GUb5psm2_Qmc_LlEF7GP/wcIHIg_4MjQh8NC5wfep/LSmTmWKKZ5smuAQbfeFE/FBYRjFmbJQpV--JKtz4i, not stripped"
   export TARGETPLATFORM=linux/386
   run xx-verify /idontexist

src/xx-verify

@@ -144,7 +144,8 @@ for f in "$@"; do
   fi
 
   expArch=""
-  expArch2="" # extra check for endianness
+  expArchAlt="" # alternate arch name
+  expArch2=""   # extra check for endianness
   case "$TARGETARCH" in
     "arm64")
       case "$TARGETOS" in
@@ -226,7 +227,8 @@ for f in "$@"; do
       expArch2="64-bit LSB"
       ;;
     "386")
-      expArch="Intel 80386"
+      expArch="Intel i386"
+      expArchAlt="Intel 80386"
       if [ "$TARGETOS" != "windows" ]; then
         expArch2="32-bit LSB"
       fi
@@ -239,8 +241,15 @@ for f in "$@"; do
   fi
 
   if ! echo "$out" | grep "$expArch" >/dev/null; then
-    echo >&2 "file ${f} does not match expected target architecture ${TARGETARCH}: $out"
-    exit 1
+    if [ -n "$expArchAlt" ]; then
+      if ! echo "$out" | grep "$expArchAlt" >/dev/null; then
+        echo >&2 "file ${f} does not match expected target architecture ${TARGETARCH}: $out"
+        exit 1
+      fi
+    else
+      echo >&2 "file ${f} does not match expected target architecture ${TARGETARCH}: $out"
+      exit 1
+    fi
   fi
 
   if [ -n "$expArch2" ]; then