Added autotest -e (do not use -noexpr on write_verilog)

diff --git a/tests/asicworld/run-test.sh b/tests/asicworld/run-test.sh
index 2477181a65d9d239c4c61244d8b9bc7a0c879fd6..24983f1a5a580d9fcfc9d43cd2342a1e0cab6c82 100755 (executable)
--- a/tests/asicworld/run-test.sh
+++ b/tests/asicworld/run-test.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-exec ${MAKE:-make} -f ../tools/autotest.mk *.v
+exec ${MAKE:-make} -f ../tools/autotest.mk EXTRA_FLAGS="-e" *.v

diff --git a/tests/hana/run-test.sh b/tests/hana/run-test.sh
index d719c46bdf5b2453391c973477188fc53349b06d..fb766eec9525c100d7d9f291387e7a02bc16bd12 100755 (executable)
--- a/tests/hana/run-test.sh
+++ b/tests/hana/run-test.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-exec ${MAKE:-make} -f ../tools/autotest.mk EXTRA_FLAGS="-l hana_vlib.v -n 300" test_*.v
+exec ${MAKE:-make} -f ../tools/autotest.mk EXTRA_FLAGS="-l hana_vlib.v -n 300 -e" test_*.v

diff --git a/tests/tools/autotest.sh b/tests/tools/autotest.sh
index 9ae1c15558ee7bf153f38b0334aca285b794e28e..5003280ef9082a7f1d9694115de2b5bdc8185375 100755 (executable)
--- a/tests/tools/autotest.sh
+++ b/tests/tools/autotest.sh
@@ -19,7 +19,7 @@ if [ ! -f $toolsdir/cmp_tbdata -o $toolsdir/cmp_tbdata.c -nt $toolsdir/cmp_tbdat
        ( set -ex;  gcc -Wall -o $toolsdir/cmp_tbdata $toolsdir/cmp_tbdata.c; ) || exit 1
 fi
 
-while getopts xmGl:wkjvrf:s:p:n: opt; do
+while getopts xmGl:wkjvref:s:p:n: opt; do
        case "$opt" in
                x)
                        use_xsim=true ;;
@@ -39,6 +39,8 @@ while getopts xmGl:wkjvrf:s:p:n: opt; do
                        verbose=true ;;
                r)
                        backend_opts="$backend_opts -norename" ;;
+               e)
+                       backend_opts="$( echo " $backend_opts " | sed 's, -noexpr ,,; s,^ ,,; s, $,,;'; )" ;;
                f)
                        frontend="$OPTARG" ;;
                s)
@@ -49,7 +51,7 @@ while getopts xmGl:wkjvrf:s:p:n: opt; do
                n)
                        autotb_opts="$autotb_opts -n $OPTARG" ;;
                *)
-                       echo "Usage: $0 [-x|-m] [-w] [-k] [-j] [-v] [-r] [-l libs] [-f frontend] [-s script] [-p cmdstring] verilog-files\n" >&2
+                       echo "Usage: $0 [-x|-m] [-w] [-k] [-j] [-v] [-r] [-e] [-l libs] [-f frontend] [-s script] [-p cmdstring] verilog-files\n" >&2
                        exit 1
        esac
 done