test suite: Separate t-gdr-gbp-import-core from -with-queue

NFC

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

diff --git a/tests/lib-gdr b/tests/lib-gdr
index acbfa92d29cc5b8653e1ba4ab025474da2611ab3..e6af12a65945ca5e087ed56aea269ad041cc5843 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -351,6 +351,10 @@ t-gdr-gbp-import-core () {
        git add debian
        git commit -m "an upstream retcon ($0)"
        git tag v1.0
+}
+
+t-gdr-gbp-import-core-with-queue () {
+       t-gdr-gbp-import-core
 
        : 'fake up that our quilt-tip was descended from upstream'
        git checkout quilt-tip

diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index 3b555e583d5bc9463d3260fa6de55140a93e0b38..93ed4b60b028d4980dbfc772e2b90821cb4692f7 100755 (executable)
--- a/tests/setup/gdr-convert-gbp
+++ b/tests/setup/gdr-convert-gbp
@@ -15,7 +15,7 @@ not-gdr-processable () {
        t-git-debrebase analyse | grep 'Unknown Unprocessable'
 }
 
-t-gdr-gbp-import-core
+t-gdr-gbp-import-core-with-queue
 
 not-gdr-processable origin
 

diff --git a/tests/tests/gdr-import-nostitch b/tests/tests/gdr-import-nostitch
index c1a52574def3b12ab549907dde10978faf2babaf..c32b71e6f2efe514042d8b65b18a72105a8d5cc6 100755 (executable)
--- a/tests/tests/gdr-import-nostitch
+++ b/tests/tests/gdr-import-nostitch
@@ -8,7 +8,7 @@ t-dependencies GDR
 
 t-tstunt-parsechangelog
 
-t-gdr-gbp-import-core
+t-gdr-gbp-import-core-with-queue
 
 git checkout master