|
@@ -15,7 +15,7 @@ tf_has_files() {
|
15
|
15
|
}
|
16
|
16
|
|
17
|
17
|
tf_enum_tests() {
|
18
|
|
- find test/scripts -maxdepth 1 -type f -perm /111 | cut -d/ -f3-
|
|
18
|
+ find test/tests -mindepth 2 -maxdepth 2 -type f -perm /111 | cut -d/ -f3
|
19
|
19
|
}
|
20
|
20
|
|
21
|
21
|
tf_run_tests() {
|
|
@@ -28,12 +28,10 @@ tf_run_tests() {
|
28
|
28
|
do
|
29
|
29
|
tf_think "... $tname"
|
30
|
30
|
tmpdir=$(mktemp -d)
|
31
|
|
- datadir="$TF_PROJDIR/test/data/$tname"
|
32
|
31
|
stamp=$(date +artifacts-$tname-%Y%m%d-%H%M%S)
|
33
|
32
|
pushd $tmpdir >/dev/null
|
34
|
|
- cp -r "$TF_PROJDIR/test/scripts/$tname" .
|
35
|
|
- tf_has_files "$datadir" && cp -r "$datadir/"* .
|
36
|
|
- TF_TNAME="$tname" ./$tname
|
|
33
|
+ cp -r "$TF_PROJDIR/test/tests/$tname/"* .
|
|
34
|
+ TF_TNAME="$tname" ./TF_RUN
|
37
|
35
|
tes=$?
|
38
|
36
|
case $tes in
|
39
|
37
|
0|2) # ok | bailout (skipped)
|