diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-05 22:42:21 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-15 19:42:05 +0100 |
| commit | f81f0db4c42e6f9439146680b0bd057d0d64b672 (patch) | |
| tree | 0c730afc3a058c19598b7c77a2e31dc82e83679e | |
| parent | c1701e7d575aec2dc420b0f54bf648e6d3fb1938 (diff) | |
Test suite: quilt-gb-build-modes: Fixes, passes now
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rw-r--r-- | debian/tests/control | 9 | ||||
| -rwxr-xr-x | tests/tests/quilt-gbp-build-modes | 6 |
2 files changed, 5 insertions, 10 deletions
diff --git a/debian/tests/control b/debian/tests/control index e1c48c6..eefd902 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -2,11 +2,6 @@ Tests: build-modes-gbp Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, git-buildpackage -Tests: build-modes-sbuild -Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, sbuild -Restrictions: x-dgit-schroot-build - Tests: dsd-clone-drs Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts @@ -16,10 +11,10 @@ Tests: mirror mirror-debnewgit mirror-private Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, rsync -Tests: quilt-gbp-build-modes +Tests: build-modes-sbuild quilt-gbp-build-modes Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, sbuild -Restrictions: x-dgit-unfinished x-dgit-schroot-build +Restrictions: x-dgit-schroot-build Tests: build-modes build-modes-asplit build-modes-gbp-asplit clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast inarchivecopy newtag-clone-nogit oldtag-clone-nogit push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-singlepatch rpush tag-updates test-list-uptodate trustingpolicy-replay Tests-Directory: tests/tests diff --git a/tests/tests/quilt-gbp-build-modes b/tests/tests/quilt-gbp-build-modes index 4e256fe..28711cc 100755 --- a/tests/tests/quilt-gbp-build-modes +++ b/tests/tests/quilt-gbp-build-modes @@ -4,12 +4,11 @@ set -e . $troot/lib-build-modes t-dependencies sbuild -t-restrict x-dgit-unfinished t-restrict x-dgit-schroot-build t-gbp-example-prep -git checkout -b for-build-modes patch-queue/quilt-tip-2 +git checkout -b for-build-modes qc/quilt-tip-2 # build-modes cannot cope with branches containing / bm-prep-ownpackage-branches for-build-modes @@ -22,12 +21,13 @@ for act in \ 'build -S' \ 'gbp-build -S' \ 'gbp-build -b' \ - 'sbuild -c build --no-arch-all' \ + 'sbuild -c build --arch-all' \ ; do bm-guess-e-source-e-targets "$act" real_act="--quilt=gbp $act" case "$act" in sbuild*) bm_quirk_after_act=bm-quirk-sbuild-after-act ;; + gbp-*) real_act="$real_act --git-ignore-branch" ;; *) bm_quirk_after_act='' ;; esac bm-act-iterate |