From 8e81a88c7d1209436996db36217568fc44f889b0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 4 Nov 2009 20:30:44 -0500 Subject: [PATCH] --max-parallel requires a number --- Debian/Debhelper/Dh_Buildsystems.pm | 2 +- debhelper.pod | 2 +- t/buildsystems/buildsystem_tests | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm index fc06a2a..a9a13a2 100644 --- a/Debian/Debhelper/Dh_Buildsystems.pm +++ b/Debian/Debhelper/Dh_Buildsystems.pm @@ -129,7 +129,7 @@ sub buildsystems_init { "l" => \$opt_list, "list" => \$opt_list, - "max-parallel:i" => \$max_parallel, + "max-parallel=i" => \$max_parallel, ); $args{options}{$_} = $options{$_} foreach keys(%options); Debian::Debhelper::Dh_Lib::init(%args); diff --git a/debhelper.pod b/debhelper.pod index 0a9ef41..78de41d 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -205,7 +205,7 @@ If the build system prefers out of source tree building but still allows in source building, the latter can be re-enabled by passing a build directory path that is the same as the source directory path. -=item B<--max-parallel>[I<=maximum>] +=item B<--max-parallel>I<=maximum> By default, the DEB_BUILD_OPTIONS environment variable can be used to enable parallel building, when supported by the build system. diff --git a/t/buildsystems/buildsystem_tests b/t/buildsystems/buildsystem_tests index 16a8a75..0465a93 100755 --- a/t/buildsystems/buildsystem_tests +++ b/t/buildsystems/buildsystem_tests @@ -1,6 +1,6 @@ #!/usr/bin/perl -use Test::More tests => 280; +use Test::More tests => 277; use strict; use warnings; @@ -557,14 +557,10 @@ sub test_is_parallel { test_isnt_parallel( do_parallel_mk(), "No parallel by default" ); -test_isnt_parallel( do_parallel_mk("--max-parallel"), - "No parallel by default with --max-parallel" ); $ENV{DEB_BUILD_OPTIONS}="parallel=5"; test_is_parallel( do_parallel_mk(), "DEB_BUILD_OPTIONS=parallel=5 without --max-parallel" ); -test_is_parallel( do_parallel_mk("--max-parallel"), - "DEB_BUILD_OPTIONS=parallel=5 with --max-parallel" ); test_is_parallel( do_parallel_mk("--max-parallel=2"), "DEB_BUILD_OPTIONS=parallel=5 with --max-parallel=2" ); test_isnt_parallel( do_parallel_mk("--max-parallel=1"), -- 2.39.2