diff options
| author | Modestas Vainius <modestas@vainius.eu> | 2009-06-13 17:31:23 +0300 |
|---|---|---|
| committer | Modestas Vainius <modestas@vainius.eu> | 2009-06-13 18:37:22 +0300 |
| commit | d5e82a031c4aa57091c459d8c05cd278433e7c8b (patch) | |
| tree | 1eaa233ec715fa88b0ee514bb11e71d613e1e660 /t | |
| parent | 62935f37b81b97baa72efd77a9e913756a60ac2c (diff) | |
| download | debhelper-d5e82a031c4aa57091c459d8c05cd278433e7c8b.tar.gz | |
New short switches for buildsystem stuff, drop envvars
* New short switches:
-D = --sourcedirectory
-B = --builddirectory
-S = --buildsystem
* Drop DH_AUTO_BUILD* environment variables (reintroduced due to revert).
* Adjust test suite.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Diffstat (limited to 't')
| -rwxr-xr-x | t/buildsystems/buildsystem_tests | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/t/buildsystems/buildsystem_tests b/t/buildsystems/buildsystem_tests index e1ca8bbe..031828b7 100755 --- a/t/buildsystems/buildsystem_tests +++ b/t/buildsystems/buildsystem_tests @@ -353,16 +353,16 @@ if (defined \$bs) { EOF } -is_deeply( process_stdout("DH_AUTO_OPTIONS='--builddirectory=autoconf/bld\\ dir --sourcedirectory autoconf' $^X -- -", +is_deeply( process_stdout("$^X -- - --builddirectory='autoconf/bld dir' --sourcedirectory autoconf", get_load_bs_source(undef, "configure")), [ 'NAME=autoconf', 'builddir=autoconf/bld dir', 'makecmd=make', 'sourcedir=autoconf' ], - "dh_auto_options w/space, autoconf autoselection and sourcedir/builddir" ); + "autoconf autoselection and sourcedir/builddir" ); -is_deeply( process_stdout("$^X -- - -cautoconf -d autoconf", get_load_bs_source("autoconf", "build")), +is_deeply( process_stdout("$^X -- - -Sautoconf -D autoconf", get_load_bs_source("autoconf", "build")), [ 'NAME=autoconf', 'builddir=undef', 'makecmd=make', 'sourcedir=autoconf' ], "forced autoconf and sourcedir" ); -is_deeply( process_stdout("$^X -- - -b -cautoconf", get_load_bs_source("autoconf", "build")), +is_deeply( process_stdout("$^X -- - -B -Sautoconf", get_load_bs_source("autoconf", "build")), [ 'NAME=autoconf', "builddir=$default_builddir", 'makecmd=make', 'sourcedir=.' ], "forced autoconf and default build directory" ); @@ -374,11 +374,11 @@ sub dh_auto_do_autoconf { my (@lines, @extra_args); my $buildpath = $sourcedir; - my @dh_auto_args = ("-d", $sourcedir); - my $dh_auto_str = "-d $sourcedir"; + my @dh_auto_args = ("-D", $sourcedir); + my $dh_auto_str = "-D $sourcedir"; if ($builddir) { - push @dh_auto_args, "-b", $builddir; - $dh_auto_str .= " -b $builddir"; + push @dh_auto_args, "-B", $builddir; + $dh_auto_str .= " -B $builddir"; $buildpath = $builddir; } |