X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/61e927785a8b79141cb5aac622cb00b547b78b9b..8d1cb6da6e21302c654da3f09de3975af7e4a11f:/test/integration/run-tests?ds=inline

diff --git a/test/integration/run-tests b/test/integration/run-tests
index 87cc292d7..78f24fbaf 100755
--- a/test/integration/run-tests
+++ b/test/integration/run-tests
@@ -47,6 +47,8 @@ fi
 if [ -n "$TESTTORUN" ]; then
 	# collecting the output of one test to have it together
 	OUTPUT="$(mktemp)"
+	CURRENTTRAP="rm -f \"$OUTPUT\"; $CURRENTTRAP"
+	trap "$CURRENTTRAP" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
 	{
 		if [ "$MSGLEVEL" -le 2 ]; then
 			printf "${CTEST}Testcase ${CHIGH}${TESTTORUN##*/}${CRESET}: "
@@ -81,12 +83,13 @@ PASS=0
 ALL=0
 FAILED_TESTS=""
 DIR="$(readlink -f "$(dirname "$0")")"
-TESTLIST="$(run-parts --list "$DIR" --regex '^test-.*$')"
+cd "$DIR"
+TESTLIST="$(find . -mindepth 1 -maxdepth 1 -regex '^\./test-[^/]*$' | sort)"
 if [ -n "$APT_TEST_JOBS" ]; then
 	if [ "$MSGCOLOR" != 'NO' ]; then
 		export MSGCOLOR='ALWAYS'
 	fi
-	exec parallel -j "$APT_TEST_JOBS" "$0" -- $(echo "$TESTLIST")
+	exec parallel -j "$APT_TEST_JOBS" "./$(basename "$0")" -- $(echo "$TESTLIST")
 fi
 TOTAL="$(echo "$TESTLIST" | wc -l)"
 for testcase in $TESTLIST; do