Skip to content

Commit 6a7e12b

Browse files
committed
testall: Adjusted to skip .sub.cf files
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>
1 parent d5ee2d3 commit 6a7e12b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

tests/acceptance/testall

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,13 +1059,13 @@ then
10591059
ALL_TESTS="$ALL_TESTS${ALL_TESTS:+ }$test"
10601060
elif [ -d $test ]
10611061
then
1062-
ALL_TESTS="$ALL_TESTS${ALL_TESTS:+ }$(find "$test" -name workdir -prune -o -name '*.cf' -print | sort)"
1062+
ALL_TESTS="$ALL_TESTS${ALL_TESTS:+ }$(find "$test" -name workdir -prune -o -name '*.cf' -and -not -name '*.sub.cf' -print | sort)"
10631063
else
10641064
echo "Unable to open test file/directory: $test"
10651065
fi
10661066
done
10671067
else
1068-
ALL_TESTS="$ALL_TESTS${ALL_TESTS:+ }$(find . \( -name selftest -o -name workdir \) -prune -o -name '*.cf' -print | sort)"
1068+
ALL_TESTS="$ALL_TESTS${ALL_TESTS:+ }$(find . \( -name selftest -o -name workdir \) -prune -o -name '*.cf' -and -not -name '*.sub.cf' -print | sort)"
10691069
fi
10701070

10711071
for addtest in $ALL_TESTS

0 commit comments

Comments
 (0)