From 57aa1ec37519bff08070a35d55613c8a753c08fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Thu, 29 Sep 2011 12:59:11 +0000 Subject: fixed tests to run from a separate dir svn path=/trunk/externals/zexy/; revision=15406 --- tests/Makefile.am | 10 +++-- tests/runtests.sh | 11 ++++-- tests/runtests.txt | 105 ----------------------------------------------------- 3 files changed, 14 insertions(+), 112 deletions(-) delete mode 100644 tests/runtests.txt (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index d0d9455..4010f0a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,14 +1,18 @@ AUTOMAKE_OPTIONS = foreign -TESTS_ENVIRONMENT = RUNTESTS_NOLOG=yes +TESTS_ENVIRONMENT = RUNTESTS_NOLOG=yes TESTDIR=$(srcdir) TESTS=runtests.sh +clean-local: + -rm -f runtests.txt + EXTRA_DIST = \ README.txt \ runtests.sh \ runtests.bat \ - runtests.txt \ + runtests_nogui.pd \ + runtests.pd \ testunit.pd EXTRA_DIST += \ @@ -111,8 +115,6 @@ EXTRA_DIST += \ or~/dualnoise.pd \ or~/singlenoise.pd \ repeat/noargs.pd \ - runtests_nogui.pd \ - runtests.pd \ s2l/numsymbols.pd \ sgn~/simple.pd \ testtests/fail_noresult.pd \ diff --git a/tests/runtests.sh b/tests/runtests.sh index cbe3a92..cac1184 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -18,7 +18,12 @@ else exit 77 fi +echo running tests in ${TESTDIR:=.} + + SUFFIX=$(date +%y%m%d-%H%M%S) +RUNTESTS_FINAL_LOG=runtest-${SUFFIX}.log + RUNTESTS_TXT=runtests.txt if which tempfile > /dev/null @@ -28,11 +33,11 @@ else RUNTESTS_LOG=tmp$$.log fi -LIBFLAGS="-path ../src/.libs/:../src/:../ -lib zexy -path ../abs/" +LIBFLAGS="-path ../src/.libs/:../src/:../ -lib zexy -path ../abs/:${TESTDIR}:." list_tests() { # find . -mindepth 2 -name "*.pd" | sed 's|\.pd$|;|' - ls -1 */*.pd | sed 's|\.pd$|;|' + ls -1 ${TESTDIR}/*/*.pd | sed 's|\.pd$|;|' } debug() { @@ -119,7 +124,7 @@ else run_nogui fi -if [ "x${RUNTESTS_NOLOG}" = "x" ]; then +if [ "x${RUNTESTS_NOLOG}" != "x" ]; then RUNTESTS_FINAL_LOG= fi if [ "x${RUNTESTS_FINAL_LOG}" = "x" ]; then diff --git a/tests/runtests.txt b/tests/runtests.txt deleted file mode 100644 index 0acd4f3..0000000 --- a/tests/runtests.txt +++ /dev/null @@ -1,105 +0,0 @@ -absgn~/abs; -absgn~/sgn; -abs~/simple; -and~/dualnoise; -and~/singlenoise; -eq~/dualnoise; -eq~/singlenoise; -gt~/dualnoise; -gt~/singlenoise; -help-msg/0x260x260x7e; -help-msg/0x2e; -help-msg/0x3c0x7e; -help-msg/0x3d0x3d0x7e; -help-msg/0x3e0x7e; -help-msg/0x7c0x7c0x7e; -help-msg/a2l; -help-msg/absgn~; -help-msg/abs~; -help-msg/atoi; -help-msg/avg~; -help-msg/blockmirror~; -help-msg/blockswap~; -help-msg/date; -help-msg/demultiplex~; -help-msg/demultiplex; -help-msg/dfreq~; -help-msg/dirac~; -help-msg/drip; -help-msg/envrms~; -help-msg/fifop; -help-msg/glue; -help-msg/index; -help-msg/length; -help-msg/lifop; -help-msg/limiter~; -help-msg/list2int; -help-msg/list2symbol; -help-msg/lister; -help-msg/lpt; -help-msg/makesymbol; -help-msg/mavg; -help-msg/minmax; -help-msg/msgfile; -help-msg/multiline~; -help-msg/multiplex~; -help-msg/multiplex; -help-msg/niagara; -help-msg/noish~; -help-msg/noisi~; -help-msg/operating_system; -help-msg/packel; -help-msg/pack~; -help-msg/pdf~; -help-msg/prime; -help-msg/quantize~; -help-msg/regex; -help-msg/relay; -help-msg/repack; -help-msg/repeat; -help-msg/sfplay; -help-msg/sfrecord; -help-msg/sgn~; -help-msg/sigzero~; -help-msg/sort; -help-msg/step~; -help-msg/strcmp; -help-msg/sum; -help-msg/swap~; -help-msg/symbol2list; -help-msg/tabdump; -help-msg/tabminmax; -help-msg/tabset; -help-msg/tavg~; -help-msg/time; -help-msg/unpack~; -help-msg/urn; -help-msg/wrap; -help-msg/zexy_; -help-msg/z~; -l2s/argument; -l2s/delimiter; -list2lists/negativelength; -lister/inline2; -lister/inline; -lt~/dualnoise; -lt~/singlenoise; -msgfile/add2; -msgfile/empty_at_end; -msgfile/emptyreplace; -msgfile/loadingCR; -msgfile/loading; -msgfile/prev_from_end; -msgfile/reentrant; -or~/dualnoise; -or~/singlenoise; -repeat/noargs; -s2l/numsymbols; -sgn~/simple; -testtests/fail_noresult; -testtests/fail; -testtests/fail_wait0; -testtests/fail_wait10; -testtests/pass; -testtests/pass_wait0; -testtests/pass_wait10; -- cgit v1.2.1