Test suite: setup import: Cope with nested and multiple imports

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 3ddb98051e85890572809e56172575275433e13f..fe8d8fc01ab5aa51a7c361113777a13a68bd4afa 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -381,7 +381,8 @@ t-setup-done () {
        local savedirs=$2
        local importeval=$3
 
-       exec 4>$tmp/IMPORT.new
+       local import=IMPORT.${0##*/}
+       exec 4>$tmp/$import.new
 
        local vn
        for vn in $savevars; do
@@ -390,11 +391,11 @@ t-setup-done () {
                ' $vn "$(eval "printf '%s\n' \"\$$vn\"")"
        done
 
-       (set -e; cd $tmp; tar cf IMPORT.tar $savedirs)
+       (set -e; cd $tmp; tar cf $import.tar $savedirs)
 
        printf >&4 "\n%s\n" "$importeval"
 
-       mv -f $tmp/IMPORT.new $tmp/IMPORT
+       mv -f $tmp/$import.new $tmp/$import
 }
 
 t-setup-import () {
@@ -412,7 +413,7 @@ t-setup-import () {
                lock="$setupsrc.lock"
        fi
 
-       local simport="$setupsrc/IMPORT"
+       local simport="$setupsrc/IMPORT.$setupname"
 
        if ! [ -e "$simport" ]; then
                with-lock-ex -w "$lock" \