Create a common out_test.sh test script to be used by a variety of tests.

Rename objfmts/bin/tests/*.bin.hx to *.hex to fit better in the common usage.

svn path=/trunk/yasm/; revision=733

diff --git a/Makefile.am b/Makefile.am
index a0ea11535dd82e16ba2ec86a007e81be8c736a95..3b30bbc192a63a097203cd36aaff5dc4f42c6ec9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,7 @@ include tools/Makefile.inc
 include src/Makefile.inc
 
 EXTRA_DIST += \
+       out_test.sh \
        strsep.c mergesort.c \
        COPYING.LIB-2.0 \
        splint.sh \

diff --git a/modules/objfmts/bin/tests/Makefile.inc b/modules/objfmts/bin/tests/Makefile.inc
index b6926d2192186fefd3e8f74672599cc4d4ff966c..4a5f7a7452cd2362668b91f31b394b857d882dc1 100644 (file)
--- a/modules/objfmts/bin/tests/Makefile.inc
+++ b/modules/objfmts/bin/tests/Makefile.inc
@@ -1,23 +1,23 @@
 # $IdPath$
 
 TESTS += \
-       src/objfmts/bin/tests/objfmt_test.sh
+       src/objfmts/bin/tests/bin_test.sh
 
 EXTRA_DIST += \
-       src/objfmts/bin/tests/objfmt_test.sh            \
+       src/objfmts/bin/tests/bin_test.sh               \
        src/objfmts/bin/tests/float-err.asm             \
        src/objfmts/bin/tests/float-err.errwarn         \
        src/objfmts/bin/tests/float.asm                 \
-       src/objfmts/bin/tests/float.bin.hx              \
+       src/objfmts/bin/tests/float.hex                 \
        src/objfmts/bin/tests/float.errwarn             \
        src/objfmts/bin/tests/integer-warn.asm          \
-       src/objfmts/bin/tests/integer-warn.bin.hx       \
+       src/objfmts/bin/tests/integer-warn.hex          \
        src/objfmts/bin/tests/integer-warn.errwarn      \
        src/objfmts/bin/tests/integer.asm               \
-       src/objfmts/bin/tests/integer.bin.hx            \
+       src/objfmts/bin/tests/integer.hex               \
        src/objfmts/bin/tests/integer.errwarn           \
        src/objfmts/bin/tests/reserve.asm               \
-       src/objfmts/bin/tests/reserve.bin.hx            \
+       src/objfmts/bin/tests/reserve.hex               \
        src/objfmts/bin/tests/reserve.errwarn           \
        src/objfmts/bin/tests/reserve-err.asm           \
        src/objfmts/bin/tests/reserve-err.errwarn

diff --git a/modules/objfmts/bin/tests/bin_test.sh b/modules/objfmts/bin/tests/bin_test.sh
new file mode 100755 (executable)
index 0000000..09d3963
--- /dev/null
+++ b/modules/objfmts/bin/tests/bin_test.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+# $IdPath$
+${srcdir}/out_test.sh bin_test src/objfmts/bin/tests "bin objfmt" "-f bin" ""
+exit $?

diff --git a/modules/objfmts/bin/tests/float.bin.hx b/modules/objfmts/bin/tests/float.hex
similarity index 100%
rename from modules/objfmts/bin/tests/float.bin.hx
rename to modules/objfmts/bin/tests/float.hex

diff --git a/modules/objfmts/bin/tests/integer-warn.bin.hx b/modules/objfmts/bin/tests/integer-warn.hex
similarity index 100%
rename from modules/objfmts/bin/tests/integer-warn.bin.hx
rename to modules/objfmts/bin/tests/integer-warn.hex

diff --git a/modules/objfmts/bin/tests/integer.bin.hx b/modules/objfmts/bin/tests/integer.hex
similarity index 100%
rename from modules/objfmts/bin/tests/integer.bin.hx
rename to modules/objfmts/bin/tests/integer.hex

diff --git a/modules/objfmts/bin/tests/reserve.bin.hx b/modules/objfmts/bin/tests/reserve.hex
similarity index 100%
rename from modules/objfmts/bin/tests/reserve.bin.hx
rename to modules/objfmts/bin/tests/reserve.hex

diff --git a/modules/objfmts/bin/tests/objfmt_test.sh b/out_test.sh
similarity index 82%
rename from modules/objfmts/bin/tests/objfmt_test.sh
rename to out_test.sh
index 7f595d70d1ba21724858598e4c431d284f96e762..6b08aa14370d7a241c873cfbf293a2f12398b08b 100755 (executable)
--- a/modules/objfmts/bin/tests/objfmt_test.sh
+++ b/out_test.sh
@@ -9,21 +9,21 @@ passedct=0
 failedct=0
 errorct=0
 
-OT="objfmt_test"
+OT=$1
 
 
-for asm in ${srcdir}/src/objfmts/bin/tests/*.asm
+for asm in ${srcdir}/$2/*.asm
 do
     a=`echo ${asm} | sed -e 's,^.*/,,' | sed -e 's,.asm$,,'`
-    o=${a}
+    o=${a}$5
     oh=${o}.hx
-    og=`echo ${asm} | sed -e 's,.asm$,.bin.hx,'`
+    og=`echo ${asm} | sed -e 's,.asm$,.hex,'`
     e=${a}.ew
     eg=`echo ${asm} | sed -e 's,.asm$,.errwarn,'`
 
-    echo -n "$OT: Testing bin objfmt for ${a} return value ..."
+    echo -n "$OT: Testing $3 for ${a} return value ..."
     # Run within a subshell to prevent signal messages from displaying.
-    sh -c "./yasm -f bin ${asm} -o ${o} 2>${e}" 2>/dev/null
+    sh -c "./yasm $4 ${asm} -o ${o} 2>${e}" 2>/dev/null
     status=$?
     if test $status -gt 128; then
        # We should never get a coredump!
@@ -38,7 +38,7 @@ do
        else
            echo " PASS."
            passedct=`expr $passedct + 1`
-           echo -n "$OT: Testing bin objfmt for ${a} error/warnings ..."
+           echo -n "$OT: Testing $3 for ${a} error/warnings ..."
            # We got errors, check to see if they match:
            cat ${e} | sed -e "s,${srcdir}/,./," >${e}.2
            mv ${e}.2 ${e}
@@ -61,12 +61,12 @@ do
        else
            echo " PASS."
            passedct=`expr $passedct + 1`
-           echo -n "$OT: Testing bin objfmt for ${a} output file ..."
+           echo -n "$OT: Testing $3 for ${a} output file ..."
            hexdump -e '1/1 "%02x " "\n"' ${o} > ${oh}
            if diff -w ${og} ${oh} > /dev/null; then
                echo " PASS."
                passedct=`expr $passedct + 1`
-               echo -n "$OT: Testing bin objfmt for ${a} error/warnings ..."
+               echo -n "$OT: Testing $3 for ${a} error/warnings ..."
                cat ${e} | sed -e "s,${srcdir}/,./," >${e}.2
                mv ${e}.2 ${e}
                if diff -w ${eg} ${e} > /dev/null; then

diff --git a/src/objfmts/bin/tests/Makefile.inc b/src/objfmts/bin/tests/Makefile.inc
index b6926d2192186fefd3e8f74672599cc4d4ff966c..4a5f7a7452cd2362668b91f31b394b857d882dc1 100644 (file)
--- a/src/objfmts/bin/tests/Makefile.inc
+++ b/src/objfmts/bin/tests/Makefile.inc
@@ -1,23 +1,23 @@
 # $IdPath$
 
 TESTS += \
-       src/objfmts/bin/tests/objfmt_test.sh
+       src/objfmts/bin/tests/bin_test.sh
 
 EXTRA_DIST += \
-       src/objfmts/bin/tests/objfmt_test.sh            \
+       src/objfmts/bin/tests/bin_test.sh               \
        src/objfmts/bin/tests/float-err.asm             \
        src/objfmts/bin/tests/float-err.errwarn         \
        src/objfmts/bin/tests/float.asm                 \
-       src/objfmts/bin/tests/float.bin.hx              \
+       src/objfmts/bin/tests/float.hex                 \
        src/objfmts/bin/tests/float.errwarn             \
        src/objfmts/bin/tests/integer-warn.asm          \
-       src/objfmts/bin/tests/integer-warn.bin.hx       \
+       src/objfmts/bin/tests/integer-warn.hex          \
        src/objfmts/bin/tests/integer-warn.errwarn      \
        src/objfmts/bin/tests/integer.asm               \
-       src/objfmts/bin/tests/integer.bin.hx            \
+       src/objfmts/bin/tests/integer.hex               \
        src/objfmts/bin/tests/integer.errwarn           \
        src/objfmts/bin/tests/reserve.asm               \
-       src/objfmts/bin/tests/reserve.bin.hx            \
+       src/objfmts/bin/tests/reserve.hex               \
        src/objfmts/bin/tests/reserve.errwarn           \
        src/objfmts/bin/tests/reserve-err.asm           \
        src/objfmts/bin/tests/reserve-err.errwarn

diff --git a/src/objfmts/bin/tests/bin_test.sh b/src/objfmts/bin/tests/bin_test.sh
new file mode 100755 (executable)
index 0000000..09d3963
--- /dev/null
+++ b/src/objfmts/bin/tests/bin_test.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+# $IdPath$
+${srcdir}/out_test.sh bin_test src/objfmts/bin/tests "bin objfmt" "-f bin" ""
+exit $?

diff --git a/src/objfmts/bin/tests/float.bin.hx b/src/objfmts/bin/tests/float.hex
similarity index 100%
rename from src/objfmts/bin/tests/float.bin.hx
rename to src/objfmts/bin/tests/float.hex

diff --git a/src/objfmts/bin/tests/integer-warn.bin.hx b/src/objfmts/bin/tests/integer-warn.hex
similarity index 100%
rename from src/objfmts/bin/tests/integer-warn.bin.hx
rename to src/objfmts/bin/tests/integer-warn.hex

diff --git a/src/objfmts/bin/tests/integer.bin.hx b/src/objfmts/bin/tests/integer.hex
similarity index 100%
rename from src/objfmts/bin/tests/integer.bin.hx
rename to src/objfmts/bin/tests/integer.hex

diff --git a/src/objfmts/bin/tests/objfmt_test.sh b/src/objfmts/bin/tests/objfmt_test.sh
deleted file mode 100755 (executable)
index 7f595d7..0000000
--- a/src/objfmts/bin/tests/objfmt_test.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-# $IdPath$
-
-#
-# Verify that all test cases match
-#
-
-passedct=0
-failedct=0
-errorct=0
-
-OT="objfmt_test"
-
-
-for asm in ${srcdir}/src/objfmts/bin/tests/*.asm
-do
-    a=`echo ${asm} | sed -e 's,^.*/,,' | sed -e 's,.asm$,,'`
-    o=${a}
-    oh=${o}.hx
-    og=`echo ${asm} | sed -e 's,.asm$,.bin.hx,'`
-    e=${a}.ew
-    eg=`echo ${asm} | sed -e 's,.asm$,.errwarn,'`
-
-    echo -n "$OT: Testing bin objfmt for ${a} return value ..."
-    # Run within a subshell to prevent signal messages from displaying.
-    sh -c "./yasm -f bin ${asm} -o ${o} 2>${e}" 2>/dev/null
-    status=$?
-    if test $status -gt 128; then
-       # We should never get a coredump!
-       echo " FAIL (crashed)."
-       failedct=`expr $failedct + 1`
-    elif test $status -gt 0; then
-       echo ${asm} | grep err >/dev/null
-               if test $? -gt 0; then
-           # YASM detected errors but shouldn't have!
-           echo " FAIL."
-           failedct=`expr $failedct + 1`
-       else
-           echo " PASS."
-           passedct=`expr $passedct + 1`
-           echo -n "$OT: Testing bin objfmt for ${a} error/warnings ..."
-           # We got errors, check to see if they match:
-           cat ${e} | sed -e "s,${srcdir}/,./," >${e}.2
-           mv ${e}.2 ${e}
-           if diff -w ${eg} ${e} > /dev/null; then
-               # Error/warnings match, it passes!
-               echo " PASS."
-               passedct=`expr $passedct + 1`
-           else
-               # Error/warnings don't match.
-               echo " FAIL."
-               failedct=`expr $failedct + 1`
-           fi
-       fi
-    else
-       echo ${asm} | grep -v err >/dev/null
-               if test $? -gt 0; then
-           # YASM detected errors but shouldn't have!
-           echo " FAIL."
-           failedct=`expr $failedct + 1`
-       else
-           echo " PASS."
-           passedct=`expr $passedct + 1`
-           echo -n "$OT: Testing bin objfmt for ${a} output file ..."
-           hexdump -e '1/1 "%02x " "\n"' ${o} > ${oh}
-           if diff -w ${og} ${oh} > /dev/null; then
-               echo " PASS."
-               passedct=`expr $passedct + 1`
-               echo -n "$OT: Testing bin objfmt for ${a} error/warnings ..."
-               cat ${e} | sed -e "s,${srcdir}/,./," >${e}.2
-               mv ${e}.2 ${e}
-               if diff -w ${eg} ${e} > /dev/null; then
-                   # Both object file and error/warnings match, it passes!
-                   echo " PASS."
-                   passedct=`expr $passedct + 1`
-               else
-                   # Error/warnings don't match.
-                   echo " FAIL."
-                   failedct=`expr $failedct + 1`
-               fi
-           else
-               # Object file doesn't match.
-               echo " FAIL."
-               failedct=`expr $failedct + 1`
-           fi
-       fi
-    fi
-done
-
-ct=`expr $failedct + $passedct + $errorct`
-per=`expr 100 \* $passedct / $ct`
-
-echo "$OT: $per%: Checks: $ct, Failures $failedct, Errors: $errorct"
-
-exit `expr $failedct + $errorct`

diff --git a/src/objfmts/bin/tests/reserve.bin.hx b/src/objfmts/bin/tests/reserve.hex
similarity index 100%
rename from src/objfmts/bin/tests/reserve.bin.hx
rename to src/objfmts/bin/tests/reserve.hex