diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 6 | ||||
| -rwxr-xr-x | tests/run_script_test.sh | 18 | ||||
| -rw-r--r-- | tests/scripts/good/4.aplwc | 6 | ||||
| -rw-r--r-- | tests/scripts/good/4.aplwc.output | 1 | ||||
| -rwxr-xr-x | tests/scripts/simfail.sh | 5 |
6 files changed, 34 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 6f4ed8e..56fb787 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,6 +13,7 @@ TEST_EXTENSIONS = TEST_INPUTS = TEST_SCRIPTS_APLWC = TEST_SCRIPTS_SH = +TEST_SCRIPTS_OUTPUT = TEST_FUZZ_CRASHES = XFAIL_TESTS = AM_TESTS_ENVIRONMENT = PATH="$(top_bindir):$$PATH"; export PATH; @@ -22,5 +23,5 @@ include src/Makefile.am include tests/Makefile.am TESTS += $(TEST_INPUTS) $(TEST_SCRIPTS_SH) $(TEST_SCRIPTS_APLWC) $(TEST_FUZZ_CRASHES) -EXTRA_DIST += $(TEST_INPUTS) $(TEST_SCRIPTS_SH) $(TEST_SCRIPTS_APLWC) +EXTRA_DIST += $(TEST_INPUTS) $(TEST_SCRIPTS_SH) $(TEST_SCRIPTS_APLWC) $(TEST_SCRIPTS_OUTPUT) CLEANFILES += $(BUILT_SOURCES) diff --git a/tests/Makefile.am b/tests/Makefile.am index 27fd83f..461f2c2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -68,7 +68,8 @@ TEST_SCRIPTS_SH += \ TEST_SCRIPTS_APLWC += \ tests/scripts/good/1.aplwc \ tests/scripts/good/2.aplwc \ - tests/scripts/good/3.aplwc + tests/scripts/good/3.aplwc \ + tests/scripts/good/4.aplwc TEST_SCRIPTS_APLWC += \ tests/scripts/bad/4.aplwc \ @@ -81,6 +82,9 @@ TEST_SCRIPTS_APLWC += \ tests/scripts/bad/12.aplwc \ tests/scripts/bad/13.aplwc +TEST_SCRIPTS_OUTPUT += \ + tests/scripts/good/4.aplwc.output + TEST_EXTENSIONS += .fuzz FUZZ_LOG_COMPILER = $(top_srcdir)/tests/run_fuzz_test.sh EXTRA_DIST += $(FUZZ_LOG_COMPILER) diff --git a/tests/run_script_test.sh b/tests/run_script_test.sh index a6ccfa8..21c4e04 100755 --- a/tests/run_script_test.sh +++ b/tests/run_script_test.sh @@ -39,13 +39,25 @@ case $expected in ;; esac -"$1" -check $? +if [ -x "$1" ] +then + "$1" + check $? +fi case "$ext" in aplwc) - aplwc "$1" + aplwc -x "$1" check $? + + if [ -f "$1.output" ] + then + aplwc -x "$1" 2>&1 | cmp - "$1.output" + if [ "$?" -ne 0 ] + then + exit 1 + fi + fi ;; esac diff --git a/tests/scripts/good/4.aplwc b/tests/scripts/good/4.aplwc new file mode 100644 index 0000000..a260efc --- /dev/null +++ b/tests/scripts/good/4.aplwc @@ -0,0 +1,6 @@ +:module Main +:run Main + +∇ Main + ⎕←'Hello from aplwc' +∇ diff --git a/tests/scripts/good/4.aplwc.output b/tests/scripts/good/4.aplwc.output new file mode 100644 index 0000000..180ee04 --- /dev/null +++ b/tests/scripts/good/4.aplwc.output @@ -0,0 +1 @@ +Hello from aplwc diff --git a/tests/scripts/simfail.sh b/tests/scripts/simfail.sh index 75b97ab..394f223 100755 --- a/tests/scripts/simfail.sh +++ b/tests/scripts/simfail.sh @@ -1,5 +1,10 @@ #!/bin/sh +if [ ! -x "$1" ] +then + exit 0 +fi + START=0 COUNT=1 |