From 65f3a1159d18c48c23187d9d35fe9632c874bc60 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 19 Apr 2013 16:33:01 -0400 Subject: [PATCH] Move run.sh to toplevel utils/, don't use lists anymore Test all subdirectories. Signed-off-by: Mathieu Desnoyers --- tests/1.8/fail/list | 33 --------------------------------- tests/1.8/fail/run.sh | 2 +- tests/1.8/pass/list | 12 ------------ tests/1.8/pass/run.sh | 2 +- tests/1.9/fail/list | 33 --------------------------------- tests/1.9/fail/run.sh | 2 +- tests/1.9/pass/list | 12 ------------ tests/1.9/pass/run.sh | 2 +- utils/run.sh | 12 ++++++++++++ 9 files changed, 16 insertions(+), 94 deletions(-) delete mode 100644 tests/1.8/fail/list delete mode 100644 tests/1.8/pass/list delete mode 100644 tests/1.9/fail/list delete mode 100644 tests/1.9/pass/list create mode 100755 utils/run.sh diff --git a/tests/1.8/fail/list b/tests/1.8/fail/list deleted file mode 100644 index 7188ec7..0000000 --- a/tests/1.8/fail/list +++ /dev/null @@ -1,33 +0,0 @@ -./test.sh empty/ -./test.sh types01/ -./test.sh types02/ -./test.sh types03/ -./test.sh types04/ -./test.sh types05/ -./test.sh types06/ -./test.sh types07/ -./test.sh types08/ -./test.sh types09/ -./test.sh types10/ -./test.sh types11/ -./test.sh types12/ -./test.sh types13/ -./test.sh types14/ -./test.sh types15/ -./test.sh types16/ -./test.sh types17/ -./test.sh types18/ -./test.sh types19/ -./test.sh types20/ -./test.sh types21/ -./test.sh types22/ -./test.sh types23/ -./test.sh types24/ -./test.sh types25/ -./test.sh types26/ -./test.sh fail1/ -./test.sh fail2/ -./test.sh integer-range/ -./test.sh lttng-modules-2.0-pre1/ -./test.sh packet-based-metadata/ -./test.sh smalltrace/ diff --git a/tests/1.8/fail/run.sh b/tests/1.8/fail/run.sh index d43ea19..1c0bdd2 100755 --- a/tests/1.8/fail/run.sh +++ b/tests/1.8/fail/run.sh @@ -1,3 +1,3 @@ #!/bin/sh -prove --exec '' --merge - < list +. ../../../utils/run.sh diff --git a/tests/1.8/pass/list b/tests/1.8/pass/list deleted file mode 100644 index ef5388d..0000000 --- a/tests/1.8/pass/list +++ /dev/null @@ -1,12 +0,0 @@ -./test.sh env-warning/ -./test.sh lttng-modules-2.0-pre5/ -./test.sh smalltrace/ -./test.sh succeed1/ -./test.sh succeed2/ -./test.sh succeed4/ -./test.sh string-concat/ -./test.sh string-literal-escape/ -./test.sh test/ -./test.sh warnings/ -./test.sh wk-heartbeat-u/ -./test.sh minimal/ diff --git a/tests/1.8/pass/run.sh b/tests/1.8/pass/run.sh index d43ea19..1c0bdd2 100755 --- a/tests/1.8/pass/run.sh +++ b/tests/1.8/pass/run.sh @@ -1,3 +1,3 @@ #!/bin/sh -prove --exec '' --merge - < list +. ../../../utils/run.sh diff --git a/tests/1.9/fail/list b/tests/1.9/fail/list deleted file mode 100644 index 7188ec7..0000000 --- a/tests/1.9/fail/list +++ /dev/null @@ -1,33 +0,0 @@ -./test.sh empty/ -./test.sh types01/ -./test.sh types02/ -./test.sh types03/ -./test.sh types04/ -./test.sh types05/ -./test.sh types06/ -./test.sh types07/ -./test.sh types08/ -./test.sh types09/ -./test.sh types10/ -./test.sh types11/ -./test.sh types12/ -./test.sh types13/ -./test.sh types14/ -./test.sh types15/ -./test.sh types16/ -./test.sh types17/ -./test.sh types18/ -./test.sh types19/ -./test.sh types20/ -./test.sh types21/ -./test.sh types22/ -./test.sh types23/ -./test.sh types24/ -./test.sh types25/ -./test.sh types26/ -./test.sh fail1/ -./test.sh fail2/ -./test.sh integer-range/ -./test.sh lttng-modules-2.0-pre1/ -./test.sh packet-based-metadata/ -./test.sh smalltrace/ diff --git a/tests/1.9/fail/run.sh b/tests/1.9/fail/run.sh index d43ea19..1c0bdd2 100755 --- a/tests/1.9/fail/run.sh +++ b/tests/1.9/fail/run.sh @@ -1,3 +1,3 @@ #!/bin/sh -prove --exec '' --merge - < list +. ../../../utils/run.sh diff --git a/tests/1.9/pass/list b/tests/1.9/pass/list deleted file mode 100644 index ef5388d..0000000 --- a/tests/1.9/pass/list +++ /dev/null @@ -1,12 +0,0 @@ -./test.sh env-warning/ -./test.sh lttng-modules-2.0-pre5/ -./test.sh smalltrace/ -./test.sh succeed1/ -./test.sh succeed2/ -./test.sh succeed4/ -./test.sh string-concat/ -./test.sh string-literal-escape/ -./test.sh test/ -./test.sh warnings/ -./test.sh wk-heartbeat-u/ -./test.sh minimal/ diff --git a/tests/1.9/pass/run.sh b/tests/1.9/pass/run.sh index d43ea19..1c0bdd2 100755 --- a/tests/1.9/pass/run.sh +++ b/tests/1.9/pass/run.sh @@ -1,3 +1,3 @@ #!/bin/sh -prove --exec '' --merge - < list +. ../../../utils/run.sh diff --git a/utils/run.sh b/utils/run.sh new file mode 100755 index 0000000..93482d9 --- /dev/null +++ b/utils/run.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +TEST_PROG="./test.sh" + +for t in */; do + if [ -n "${TEST_LIST}" ]; then + TEST_LIST="${TEST_LIST}\n" + fi + TEST_LIST="${TEST_LIST}./test.sh ${t}" +done + +echo "${TEST_LIST}" | prove --exec '' --merge - -- 2.34.1