From 63c7141275c8c5c0f6e60f5242785e50cabaf2a0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 14 Sep 2015 02:26:13 +0200 Subject: tests: try to support spaces in TMPDIR Not all tests work yet, most notable the cdrom tests, but those require changes in libapt itself to have a proper fix and what we have fixed so far is good enough progress for now. Git-Dch: Ignore --- .../integration/test-acquire-same-repository-multiple-times | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'test/integration/test-acquire-same-repository-multiple-times') diff --git a/test/integration/test-acquire-same-repository-multiple-times b/test/integration/test-acquire-same-repository-multiple-times index abdfef8f0..19a18cb63 100755 --- a/test/integration/test-acquire-same-repository-multiple-times +++ b/test/integration/test-acquire-same-repository-multiple-times @@ -21,11 +21,14 @@ done # install a slowed down file: otherwise its to fast to reproduce combining NEWMETHODS="$(readlink -f rootdir)/usr/lib/apt/methods" OLDMETHODS="$(readlink -f rootdir/usr/lib/apt/methods)" -rm $NEWMETHODS -mkdir $NEWMETHODS -for METH in $(find $OLDMETHODS ! -type d); do - ln -s $OLDMETHODS/$(basename $METH) $NEWMETHODS +rm "$NEWMETHODS" +mkdir "$NEWMETHODS" +backupIFS="$IFS" +IFS="$(printf "\n\b")" +for METH in $(find "$OLDMETHODS" ! -type d); do + ln -s "$OLDMETHODS/$(basename "$METH")" "$NEWMETHODS" done +IFS="$backupIFS" rm "${NEWMETHODS}/file" "${NEWMETHODS}/http" cat >"${NEWMETHODS}/file" < file.lst - testequal "$(find $(readlink -f ./rootdir/var/lib/apt/lists) -name '*_dists_*' \( ! -name '*InRelease' \) -type f | sort)" cat file.lst + testequal "$(find "$(readlink -f ./rootdir/var/lib/apt/lists)" -name '*_dists_*' \( ! -name '*InRelease' \) -type f | sort)" cat file.lst testsuccess aptcache policy testequal "foo: Installed: (none) -- cgit v1.2.3