From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 26 Jul 2018 11:48:42 +0000 (+0100)
Subject: test suite: Drop alwayssplit tests
X-Git-Tag: archive/debian/6.0~13
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=42d2e3ec03b634c5719700c5bcfb27f0f652d74c

test suite: Drop alwayssplit tests

Since
  dgit: make $need_split_build_invocation always true
this option has had no effect, so these tests are redundant.

And change the comment in dgit near the option parsing.

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

diff --git a/debian/tests/control b/debian/tests/control
index dfd73bb3..81fdeb73 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -60,7 +60,7 @@ Tests: trustingpolicy-replay
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, dput-ng
 
-Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-asplit build-modes-gbp-asplit checkout clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig gitworktree import-dsc import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush sourceonlypolicy tag-updates test-list-uptodate unrepresentable version-opt
+Tests: absurd-gitapply badcommit-rewrite build-modes checkout clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig gitworktree import-dsc import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush sourceonlypolicy tag-updates test-list-uptodate unrepresentable version-opt
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc
 
diff --git a/dgit b/dgit
index b1df95ee..5d7d8d7a 100755
--- a/dgit
+++ b/dgit
@@ -6913,7 +6913,7 @@ sub parseopts () {
 		$tagformat_want = [ $1, 'command line', 1 ];
 		# 1 menas overrides distro configuration
 	    } elsif (m/^--always-split-source-build$/s) {
-		# undocumented, for testing
+		# undocumented, was once for testing, now a no-op
 		push @ropts, $_;
 		$need_split_build_invocation = 1;
 	    } elsif (m/^--config-lookup-explode=(.+)$/s) {
diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index ee2975d0..cf9f6cd1 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -226,10 +226,3 @@ bm-act-iterate () {
 	done
 	: bm-act-iterate done.
 }
-
-bm-alwayssplit () {
-	local t=${0##*/}
-	DGIT_TEST_BM_BASEARGS+=' --always-split-source-build'
-	export DGIT_TEST_BM_BASEARGS
-	t-chain-test "${t%%-asplit}"
-}
diff --git a/tests/tests/build-modes-asplit b/tests/tests/build-modes-asplit
deleted file mode 100755
index fa3bf8a0..00000000
--- a/tests/tests/build-modes-asplit
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-. tests/lib
-. $troot/lib-build-modes
-bm-alwayssplit
diff --git a/tests/tests/build-modes-gbp-asplit b/tests/tests/build-modes-gbp-asplit
deleted file mode 100755
index fa3bf8a0..00000000
--- a/tests/tests/build-modes-gbp-asplit
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-. tests/lib
-. $troot/lib-build-modes
-bm-alwayssplit