From: Joey Hess Date: Tue, 30 Jun 2009 02:22:21 +0000 (-0400) Subject: remove enforce_out_of_source_building X-Git-Tag: 7.3.0~4 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9a867d7d344bc3c59a3326123f7323655c311d6c;p=debhelper.git remove enforce_out_of_source_building It was only used by the test suite, and while symetrical I don't feel that justifies keeping dead code. --- diff --git a/Debian/Debhelper/Buildsystem.pm b/Debian/Debhelper/Buildsystem.pm index 209f070..9730928 100644 --- a/Debian/Debhelper/Buildsystem.pm +++ b/Debian/Debhelper/Buildsystem.pm @@ -147,15 +147,6 @@ sub prefer_out_of_source_building { } } -# Derived class can call this method in its constructor to *enforce* -# out of source building even if the user didn't request it. -# Build directory is set to DEFAULT_BUILD_DIRECTORY or building -# fails if it is not possible to set it -sub enforce_out_of_source_building { - my $this=shift; - $this->prefer_out_of_source_building(); -} - # Enhanced version of File::Spec::canonpath. It collapses .. # too so it may return invalid path if symlinks are involved. # On the other hand, it does not need for the path to exist. diff --git a/t/buildsystems/buildsystem_tests b/t/buildsystems/buildsystem_tests index 7e9b4bf..7d38315 100755 --- a/t/buildsystems/buildsystem_tests +++ b/t/buildsystems/buildsystem_tests @@ -1,6 +1,6 @@ #!/usr/bin/perl -use Test::More tests => 236; +use Test::More tests => 227; use strict; use warnings; @@ -145,12 +145,6 @@ $bs = $BS_CLASS->new(builddir => undef, sourcedir => "autoconf"); ); test_buildsystem_paths_api($bs, "default builddir, sourcedir=autoconf", \%tmp); -# Enforce out of source tree building -# sourcedir=builddir=autoconf hence default builddir is implied -$bs = $BS_CLASS->new(builddir => "autoconf", sourcedir => "autoconf/"); -$bs->enforce_out_of_source_building(); -test_buildsystem_paths_api($bs, "hard out of source enforced, sourcedir=builddir", \%tmp); - # sourcedir=autoconf (builddir should be dropped) $bs = $BS_CLASS->new(builddir => "autoconf", sourcedir => "autoconf"); %tmp = (