Test suite: import-nonnative: Prepare for more tests

* Break chk into chk1 and chk2, so we can do stuff in the middle
* Remove $p between runs, so that we can do another test with the same $p

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/tests/tests/import-nonnative b/tests/tests/import-nonnative
index 98076f066d7ea44fdff11b7c01b64a766c032f24..d709ab594b353cacd22095bc56638c9f70fd6b6e 100755 (executable)
--- a/tests/tests/import-nonnative
+++ b/tests/tests/import-nonnative
@@ -4,12 +4,15 @@ set -e
 
 t-tstunt-parsechangelog
 
-chk () {
+chk1 () {
        p=$1
        v=$2
 
        t-archive $p $v
+}
+chk2() {
        t-git-none
+       rm -rf $p
        t-dgit --no-rm-on-error clone $p
 
        # And now we make an update using the same orig tarball, and
@@ -66,6 +69,8 @@ chk () {
        cd ..
 }
 
+chk() { chk1 "$@"; chk2; }
+
 # 1.0 with diff
 chk pari-extra 3-1