Put test suite file results into a separate "results" directory.

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

diff --git a/.cvsignore b/.cvsignore
index b6558a8750dd80815cae16862f938fe8da853eb3..0ab2d20c5ee2934ee7407ce6214a00de32fb2336 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -15,9 +15,6 @@ config.*
 stamp-h*
 aclocal.m4
 *.tar.gz
-*.yp
-*.hx
-*.ew
 *.la
 *.lo
 .libs
@@ -25,3 +22,4 @@ libtool
 *.bb
 *.bbg
 *.da
+results

diff --git a/Makefile.am b/Makefile.am
index d4a04685dc02ec9e32858e95157148264020648d..63fe1dd1900589555b9945b596cbcb435e45faba 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,3 +43,6 @@ EXTRA_DIST += \
        Mkfiles/Makefile.vc Mkfiles/vc/config.h
 
 ACLOCAL_AMFLAGS = -I m4
+
+distclean-local:
+       -rm -rf results

diff --git a/modules/arch/x86/tests/Makefile.inc b/modules/arch/x86/tests/Makefile.inc
index 83298cc89f303acc36c5baf0e42bec69f5b75a1d..b122bc44cac3b23be99458a63420559b2eabdf64 100644 (file)
--- a/modules/arch/x86/tests/Makefile.inc
+++ b/modules/arch/x86/tests/Makefile.inc
@@ -53,47 +53,3 @@ EXTRA_DIST += \
        src/arch/x86/tests/x86label.asm         \
        src/arch/x86/tests/x86label.errwarn     \
        src/arch/x86/tests/x86label.hex
-
-CLEANFILES += \
-       addbyte \
-       addbyte.ew \
-       addbyte.hx \
-       addrop \
-       addrop.ew \
-       addrop.hx \
-       addrop-err.ew \
-       cpubasic-err.ew \
-       div-err.ew \
-       effaddr \
-       effaddr.ew \
-       effaddr.hx \
-       genopcode \
-       genopcode.ew \
-       genopcode.hx \
-       lds-err.ew \
-       loopadsz \
-       loopadsz.ew \
-       loopadsz.hx \
-       negequ \
-       negequ.ew \
-       negequ.hx \
-       nomem64-err.ew \
-       nomem64 \
-       nomem64.ew \
-       nomem64.hx \
-       opersize \
-       opersize.ew \
-       opersize.hx \
-       opsize-err.ew \
-       ret \
-       ret.ew \
-       ret.hx \
-       segmov \
-       segmov.ew \
-       segmov.hx \
-       shift \
-       shift.ew \
-       shift.hx \
-       x86label \
-       x86label.ew \
-       x86label.hx

diff --git a/modules/objfmts/bin/tests/Makefile.inc b/modules/objfmts/bin/tests/Makefile.inc
index c10a435ec343d5c76a796c0ca29902bb5eaa59e0..32f66da47cc137d1c3466843647ff6ff42c1fb71 100644 (file)
--- a/modules/objfmts/bin/tests/Makefile.inc
+++ b/modules/objfmts/bin/tests/Makefile.inc
@@ -24,22 +24,3 @@ EXTRA_DIST += \
        src/objfmts/bin/tests/reserve.errwarn           \
        src/objfmts/bin/tests/reserve-err.asm           \
        src/objfmts/bin/tests/reserve-err.errwarn
-
-CLEANFILES += \
-       bintest \
-       bintest.hx \
-       bintest.ew \
-       float-err.ew \
-       float \
-       float.hx \
-       float.ew \
-       integer-warn \
-       integer-warn.hx \
-       integer-warn.ew \
-       integer \
-       integer.hx \
-       integer.ew \
-       reserve \
-       reserve.ew \
-       reserve.hx \
-       reserve-err.ew

diff --git a/modules/objfmts/coff/tests/Makefile.inc b/modules/objfmts/coff/tests/Makefile.inc
index 2df7a06a5acc2bc0552818ebe8db210763ad560c..01a30682f29c87a1c0bb478764e8dcfb598960c4 100644 (file)
--- a/modules/objfmts/coff/tests/Makefile.inc
+++ b/modules/objfmts/coff/tests/Makefile.inc
@@ -9,8 +9,3 @@ EXTRA_DIST += \
        src/objfmts/coff/tests/cofftest.asm             \
        src/objfmts/coff/tests/cofftest.hex             \
        src/objfmts/coff/tests/cofftest.errwarn
-
-CLEANFILES += \
-       cofftest.o \
-       cofftest.hx \
-       cofftest.ew

diff --git a/modules/parsers/nasm/tests/Makefile.inc b/modules/parsers/nasm/tests/Makefile.inc
index 8b2af9e0bf6853e400911b64f3ffbc8b9700ec85..b35160b5571c55d4bdfef2a71b9bb2e660d575c9 100644 (file)
--- a/modules/parsers/nasm/tests/Makefile.inc
+++ b/modules/parsers/nasm/tests/Makefile.inc
@@ -11,11 +11,3 @@ EXTRA_DIST += \
        src/parsers/nasm/tests/newsect.asm      \
        src/parsers/nasm/tests/newsect.errwarn  \
        src/parsers/nasm/tests/newsect.hex
-
-CLEANFILES += \
-       equlocal \
-       equlocal.ew \
-       equlocal.hx \
-       newsect \
-       newsect.ew \
-       newsect.hx

diff --git a/modules/preprocs/yapp/tests/Makefile.inc b/modules/preprocs/yapp/tests/Makefile.inc
index 8bfb04884d97bd4a17513ad1250c254b79e9a4e1..187ea306009a53f76021474ca353e2e3d4a08302 100644 (file)
--- a/modules/preprocs/yapp/tests/Makefile.inc
+++ b/modules/preprocs/yapp/tests/Makefile.inc
@@ -26,16 +26,3 @@ EXTRA_DIST += \
        src/preprocs/yapp/tests/rinclude.pre \
        src/preprocs/yapp/tests/params.asm \
        src/preprocs/yapp/tests/params.pre
-
-CLEANFILES += \
-       raw.yp \
-       comment.yp \
-       define.yp \
-       ddefine.yp \
-       rdefine.yp \
-       pdefine.yp \
-       ifdef.yp \
-       include.yp \
-       rinclude.yp \
-       params.yp
-

diff --git a/modules/preprocs/yapp/tests/yapp_test.sh b/modules/preprocs/yapp/tests/yapp_test.sh
index 6e46112f322a285fbf1b61dabd0252049bb6d9cd..6c1c6e63cce513372fb4b2c8fcba6d9fedd7cc8b 100755 (executable)
--- a/modules/preprocs/yapp/tests/yapp_test.sh
+++ b/modules/preprocs/yapp/tests/yapp_test.sh
@@ -8,6 +8,8 @@ case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
   *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
 esac
 
+mkdir results >/dev/null 2>&1
+
 #
 # Verify that all test cases match
 # (aside from whitespace for now)
@@ -31,8 +33,8 @@ do
 
     echo $ECHO_N "$YT: Testing yapp for ${a} ... $ECHO_C"
     if sed "s,\./,${srcdir}/," ${asm} | ./yasm -e -r yapp |
-       sed "s,${srcdir}/,./," > ${y}; then
-       if diff -w ${p} ${y} > /dev/null; then
+       sed "s,${srcdir}/,./," > results/${y}; then
+       if diff -w ${p} results/${y} > /dev/null; then
            echo "PASS."
            passedct=`expr $passedct + 1`
            passedlist="${passedlist}${a} "

diff --git a/out_test.sh b/out_test.sh
index 7adc1d25f93474b921ed492b504ff2b5732db460..e5870eb7192470e54224ad2c9d778d4eef40b69b 100755 (executable)
--- a/out_test.sh
+++ b/out_test.sh
@@ -8,6 +8,8 @@ case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
   *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
 esac
 
+mkdir results >/dev/null 2>&1
+
 #
 # Verify that all test cases match
 #
@@ -27,7 +29,7 @@ do
 
     echo $ECHO_N "$1: Testing $3 for ${a} return value ... $ECHO_C"
     # Run within a subshell to prevent signal messages from displaying.
-    sh -c "cat ${asm} | ./yasm $4 -o ${o} 2>${e}" 2>/dev/null
+    sh -c "cat ${asm} | ./yasm $4 -o results/${o} 2>results/${e}" 2>/dev/null
     status=$?
     if test $status -gt 128; then
        # We should never get a coredump!
@@ -46,7 +48,7 @@ do
            # We got errors, check to see if they match:
            #cat ${e} | sed "s,${srcdir}/,./," >${e}.2
            #mv ${e}.2 ${e}
-           diff -w ${eg} ${e} > /dev/null
+           diff -w ${eg} results/${e} > /dev/null
            if test $? -eq 0; then
                # Error/warnings match, it passes!
                echo "PASS."
@@ -67,15 +69,15 @@ do
            echo "PASS."
            passedct=`expr $passedct + 1`
            echo $ECHO_N "$1: Testing $3 for ${a} output file ... $ECHO_C"
-           ${PERL} ${srcdir}/test_hd.pl ${o} > ${oh}
-           diff ${og} ${oh} > /dev/null
+           ${PERL} ${srcdir}/test_hd.pl results/${o} > results/${oh}
+           diff ${og} results/${oh} > /dev/null
            if test $? -eq 0; then
                echo "PASS."
                passedct=`expr $passedct + 1`
                echo $ECHO_N "$1: Testing $3 for ${a} error/warnings ... $ECHO_C"
                #cat ${e} | sed "s,${srcdir}/,./," >${e}.2
                #mv ${e}.2 ${e}
-               diff -w ${eg} ${e} > /dev/null
+               diff -w ${eg} results/${e} > /dev/null
                if test $? -eq 0; then
                    # Both object file and error/warnings match, it passes!
                    echo "PASS."

diff --git a/src/arch/x86/tests/Makefile.inc b/src/arch/x86/tests/Makefile.inc
index 83298cc89f303acc36c5baf0e42bec69f5b75a1d..b122bc44cac3b23be99458a63420559b2eabdf64 100644 (file)
--- a/src/arch/x86/tests/Makefile.inc
+++ b/src/arch/x86/tests/Makefile.inc
@@ -53,47 +53,3 @@ EXTRA_DIST += \
        src/arch/x86/tests/x86label.asm         \
        src/arch/x86/tests/x86label.errwarn     \
        src/arch/x86/tests/x86label.hex
-
-CLEANFILES += \
-       addbyte \
-       addbyte.ew \
-       addbyte.hx \
-       addrop \
-       addrop.ew \
-       addrop.hx \
-       addrop-err.ew \
-       cpubasic-err.ew \
-       div-err.ew \
-       effaddr \
-       effaddr.ew \
-       effaddr.hx \
-       genopcode \
-       genopcode.ew \
-       genopcode.hx \
-       lds-err.ew \
-       loopadsz \
-       loopadsz.ew \
-       loopadsz.hx \
-       negequ \
-       negequ.ew \
-       negequ.hx \
-       nomem64-err.ew \
-       nomem64 \
-       nomem64.ew \
-       nomem64.hx \
-       opersize \
-       opersize.ew \
-       opersize.hx \
-       opsize-err.ew \
-       ret \
-       ret.ew \
-       ret.hx \
-       segmov \
-       segmov.ew \
-       segmov.hx \
-       shift \
-       shift.ew \
-       shift.hx \
-       x86label \
-       x86label.ew \
-       x86label.hx

diff --git a/src/objfmts/bin/tests/Makefile.inc b/src/objfmts/bin/tests/Makefile.inc
index c10a435ec343d5c76a796c0ca29902bb5eaa59e0..32f66da47cc137d1c3466843647ff6ff42c1fb71 100644 (file)
--- a/src/objfmts/bin/tests/Makefile.inc
+++ b/src/objfmts/bin/tests/Makefile.inc
@@ -24,22 +24,3 @@ EXTRA_DIST += \
        src/objfmts/bin/tests/reserve.errwarn           \
        src/objfmts/bin/tests/reserve-err.asm           \
        src/objfmts/bin/tests/reserve-err.errwarn
-
-CLEANFILES += \
-       bintest \
-       bintest.hx \
-       bintest.ew \
-       float-err.ew \
-       float \
-       float.hx \
-       float.ew \
-       integer-warn \
-       integer-warn.hx \
-       integer-warn.ew \
-       integer \
-       integer.hx \
-       integer.ew \
-       reserve \
-       reserve.ew \
-       reserve.hx \
-       reserve-err.ew

diff --git a/src/objfmts/coff/tests/Makefile.inc b/src/objfmts/coff/tests/Makefile.inc
index 2df7a06a5acc2bc0552818ebe8db210763ad560c..01a30682f29c87a1c0bb478764e8dcfb598960c4 100644 (file)
--- a/src/objfmts/coff/tests/Makefile.inc
+++ b/src/objfmts/coff/tests/Makefile.inc
@@ -9,8 +9,3 @@ EXTRA_DIST += \
        src/objfmts/coff/tests/cofftest.asm             \
        src/objfmts/coff/tests/cofftest.hex             \
        src/objfmts/coff/tests/cofftest.errwarn
-
-CLEANFILES += \
-       cofftest.o \
-       cofftest.hx \
-       cofftest.ew

diff --git a/src/parsers/nasm/tests/Makefile.inc b/src/parsers/nasm/tests/Makefile.inc
index 8b2af9e0bf6853e400911b64f3ffbc8b9700ec85..b35160b5571c55d4bdfef2a71b9bb2e660d575c9 100644 (file)
--- a/src/parsers/nasm/tests/Makefile.inc
+++ b/src/parsers/nasm/tests/Makefile.inc
@@ -11,11 +11,3 @@ EXTRA_DIST += \
        src/parsers/nasm/tests/newsect.asm      \
        src/parsers/nasm/tests/newsect.errwarn  \
        src/parsers/nasm/tests/newsect.hex
-
-CLEANFILES += \
-       equlocal \
-       equlocal.ew \
-       equlocal.hx \
-       newsect \
-       newsect.ew \
-       newsect.hx

diff --git a/src/preprocs/yapp/tests/Makefile.inc b/src/preprocs/yapp/tests/Makefile.inc
index 8bfb04884d97bd4a17513ad1250c254b79e9a4e1..187ea306009a53f76021474ca353e2e3d4a08302 100644 (file)
--- a/src/preprocs/yapp/tests/Makefile.inc
+++ b/src/preprocs/yapp/tests/Makefile.inc
@@ -26,16 +26,3 @@ EXTRA_DIST += \
        src/preprocs/yapp/tests/rinclude.pre \
        src/preprocs/yapp/tests/params.asm \
        src/preprocs/yapp/tests/params.pre
-
-CLEANFILES += \
-       raw.yp \
-       comment.yp \
-       define.yp \
-       ddefine.yp \
-       rdefine.yp \
-       pdefine.yp \
-       ifdef.yp \
-       include.yp \
-       rinclude.yp \
-       params.yp
-

diff --git a/src/preprocs/yapp/tests/yapp_test.sh b/src/preprocs/yapp/tests/yapp_test.sh
index 6e46112f322a285fbf1b61dabd0252049bb6d9cd..6c1c6e63cce513372fb4b2c8fcba6d9fedd7cc8b 100755 (executable)
--- a/src/preprocs/yapp/tests/yapp_test.sh
+++ b/src/preprocs/yapp/tests/yapp_test.sh
@@ -8,6 +8,8 @@ case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
   *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
 esac
 
+mkdir results >/dev/null 2>&1
+
 #
 # Verify that all test cases match
 # (aside from whitespace for now)
@@ -31,8 +33,8 @@ do
 
     echo $ECHO_N "$YT: Testing yapp for ${a} ... $ECHO_C"
     if sed "s,\./,${srcdir}/," ${asm} | ./yasm -e -r yapp |
-       sed "s,${srcdir}/,./," > ${y}; then
-       if diff -w ${p} ${y} > /dev/null; then
+       sed "s,${srcdir}/,./," > results/${y}; then
+       if diff -w ${p} results/${y} > /dev/null; then
            echo "PASS."
            passedct=`expr $passedct + 1`
            passedlist="${passedlist}${a} "