[debhelper-devel] [debhelper] 01/01: t: Disable third-party build systems

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 7362e82c51b92ebdce6036d54edacc2f48ff9077
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Aug 14 08:39:01 2016 +0000

    t: Disable third-party build systems
    
    Not all auto-selectable third-party build systems can handle being
    loaded in the conditions of the debhelper test suite.  Also, it seems
    prudent for the tests to work independently of the build environment
    having extra build systems installed.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Dh_Buildsystems.pm | 11 +++++++++--
 t/buildsystems/buildsystem_tests.t  |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index 075d34d..a2424c7 100644
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -93,6 +93,11 @@ sub autoselect_buildsystem {
 sub load_buildsystem {
 	my $system=shift;
 	my $step=shift;
+	my $system_options;
+	if (defined($system) && ref($system) eq 'HASH') {
+		$system_options = $system;
+		$system = $system_options->{'system'};
+	}
 	if (defined $system) {
 		my $inst = create_buildsystem_instance($system, 1, @_);
 		return $inst;
@@ -103,8 +108,10 @@ sub load_buildsystem {
 		foreach $system (@BUILDSYSTEMS) {
 			push @buildsystems, create_buildsystem_instance($system, 1, @_);
 		}
-		foreach $system (@THIRD_PARTY_BUILDSYSTEMS) {
-			push @buildsystems, create_buildsystem_instance($system, 0, @_);
+		if (!$system_options || $system_options->{'enable-thirdparty'}) {
+			foreach $system (@THIRD_PARTY_BUILDSYSTEMS) {
+				push @buildsystems, create_buildsystem_instance($system, 0, @_);
+			}
 		}
 		return autoselect_buildsystem($step, @buildsystems);
 	}
diff --git a/t/buildsystems/buildsystem_tests.t b/t/buildsystems/buildsystem_tests.t
index b6e2c91..5a0f57c 100755
--- a/t/buildsystems/buildsystem_tests.t
+++ b/t/buildsystems/buildsystem_tests.t
@@ -295,7 +295,7 @@ sub test_autoselection {
 	my $expected=shift;
 	my %args=@_;
 	for my $step (@STEPS) {
-		my $bs = load_buildsystem(undef, $step, @_);
+		my $bs = load_buildsystem({'enable-thirdparty' => 0}, $step, @_);
 		my $e = $expected;
 		$e = $expected->{$step} if ref $expected;
 		if (defined $bs) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git