fix tests

[ia32rtools.git] / run_imp.sh

diff --git a/run_imp.sh b/run_imp.sh
index 7c542be..15381b7 100755 (executable)
--- a/run_imp.sh
+++ b/run_imp.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-mingwb=i686-w64-mingw32
+# warning: i686-w64-mingw32- on Ubuntu 14.04
+# contains broken InterlockedDecrement
+test -n "$mingwb" || mingwb=i686-w64-mingw32
 
 target_s=$1
 src_asm=$2
@@ -25,9 +27,9 @@ cat $implist | while read i; do
     ;;
   esac
 
-  grep "\<_\?_$si\>" /usr/$mingwb/lib/lib* "$@" | awk '{print $3}' | \
+  grep -e "\<_\?_$si\>" -e "@$si\>" /usr/$mingwb/lib/lib* "$@" | awk '{print $3}' | \
     while read f; do
-      sym=`${mingwb}-nm $f | grep "\<_\?_$si\>" | grep ' T ' | awk '{print $3}'`
+      sym=`${mingwb}-nm $f | grep -e "\<_\?_$si\>" -e " @$si\>" | grep ' T ' | awk '{print $3}'`
       if test -n "$sym"; then
         echo $sym > $tmpsym
         break
@@ -35,7 +37,7 @@ cat $implist | while read i; do
     done
   sym=`cat $tmpsym`
   if test -z "$sym"; then
-    echo "no file/sym for $i, lf $f"
+    echo "$target_s: no file/sym for $i"
     exit 1
   fi