test suite: Use nproc(1) rather than Sys::CPU.

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index bc9e8c72fdc673f77b2d97a1c55ebfaf0d081c87..bd06d20d21cc7364ce1e056777e5fd03e35b4b29 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -480,12 +480,12 @@ t-setup-done () {
        local savedirs=$2
        local importeval=$3
 
-       local import=IMPORT.${0##*/}
+       local import=IMPORT.${DGIT_TEST_TESTNAME-${0##*/}}
        exec 4>$tmp/$import.new
 
        local vn
        for vn in $savevars; do
-               perl >&4 -I. -MDebian::Dgit -e '
+               perl >&4 -"I$root" -MDebian::Dgit -e '
                        printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1]
                ' $vn "$(eval "printf '%s\n' \"\$$vn\"")"
        done