diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-25 12:44:05 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-25 12:55:17 +0100 |
| commit | 79e98851edb8daa0f866fb30adab21b3f12989a9 (patch) | |
| tree | b64b311736fda2b9ff5aa70917eb73204daca938 /tests | |
| parent | 1f8626d4eaf79e8f26f0e27ff076fd5469a7cbe4 (diff) | |
test suite: Separate t-gdr-gbp-import-core from -with-queue
NFC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib-gdr | 4 | ||||
| -rwxr-xr-x | tests/setup/gdr-convert-gbp | 2 | ||||
| -rwxr-xr-x | tests/tests/gdr-import-nostitch | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index acbfa92..e6af12a 100644 --- 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 3b555e5..93ed4b6 100755 --- 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 c1a5257..c32b71e 100755 --- 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 |