diff options
| author | Jos I. Boumans <kane@dwim.org> | 2007-05-28 17:06:52 +0200 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2007-05-28 13:21:23 +0000 |
| commit | 031ea58b5f01bc2ac9d97f55c77a227a794972bf (patch) | |
| tree | 1777e546756f1928113ac4d7f91ba2f02192d01b /lib/CPANPLUS/Dist | |
| parent | 622d31ac76e641eb7d1153122d2d208f0647a442 (diff) | |
| download | perl-031ea58b5f01bc2ac9d97f55c77a227a794972bf.tar.gz | |
Add /nologo to nmake in CPANPLUS::Dist::Build too
From: "Jos I. Boumans" <kane@xs4all.nl>
Message-Id: <90E1CAA6-8529-4DD1-9D42-A377538E9320@xs4all.nl>
p4raw-id: //depot/perl@31293
Diffstat (limited to 'lib/CPANPLUS/Dist')
3 files changed, 16 insertions, 3 deletions
diff --git a/lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t b/lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t index 92da2566a0..490420e048 100644 --- a/lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t +++ b/lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t @@ -13,7 +13,7 @@ use CPANPLUS::Module::Author::Fake; use Config; use Test::More 'no_plan'; -use File::Basename (); +use File::Basename qw[basename]; use Data::Dumper; use Config; use IPC::Cmd 'can_run'; @@ -53,6 +53,19 @@ $Conf->set_conf( signature => 0 ); ### running tests will mess with the test output so skip 'm $Conf->set_conf( skiptest => 1 ); +### dmq tells us that we should run with /nologo +### if using nmake, as it's very noise otherwise. +### XXX copied from CPANPLUS' test include file! +{ my $make = $Conf->get_program('make'); + if( $make and basename($make) =~ /^nmake/i and + $make !~ m|/nologo| + ) { + $make .= ' /nologo'; + $Conf->set_program( make => $make ); + } +} + + # path, cc needed? my %Map = ( noxs => 0, xs => 1 diff --git a/lib/CPANPLUS/Dist/Build/t/src/noxs/Foo-Bar-0.01.tar.gz.packed b/lib/CPANPLUS/Dist/Build/t/src/noxs/Foo-Bar-0.01.tar.gz.packed index cc2951c868..d88c88e92a 100644 --- a/lib/CPANPLUS/Dist/Build/t/src/noxs/Foo-Bar-0.01.tar.gz.packed +++ b/lib/CPANPLUS/Dist/Build/t/src/noxs/Foo-Bar-0.01.tar.gz.packed @@ -10,7 +10,7 @@ To recreate it use the following command: uupacktool.pl -p lib/CPANPLUS/Dist/Build/t/src/noxs/Foo-Bar-0.01.tar.gz lib/CPANPLUS/Dist/Build/t/src/noxs/Foo-Bar-0.01.tar.gz.packed -Created at Tue May 22 13:44:00 2007 +Created at Mon May 28 14:55:52 2007 ######################################################################### __UU__ M'XL("-<X34(``T9O;RU"87(M,"XP,2YT87(`[9E;;]HP%,=Y]J<X+9722@-R diff --git a/lib/CPANPLUS/Dist/Build/t/src/xs/Foo-Bar-0.01.tar.gz.packed b/lib/CPANPLUS/Dist/Build/t/src/xs/Foo-Bar-0.01.tar.gz.packed index bdb76d27d2..56c3ff69ff 100644 --- a/lib/CPANPLUS/Dist/Build/t/src/xs/Foo-Bar-0.01.tar.gz.packed +++ b/lib/CPANPLUS/Dist/Build/t/src/xs/Foo-Bar-0.01.tar.gz.packed @@ -10,7 +10,7 @@ To recreate it use the following command: uupacktool.pl -p lib/CPANPLUS/Dist/Build/t/src/xs/Foo-Bar-0.01.tar.gz lib/CPANPLUS/Dist/Build/t/src/xs/Foo-Bar-0.01.tar.gz.packed -Created at Tue May 22 13:44:00 2007 +Created at Mon May 28 14:55:52 2007 ######################################################################### __UU__ M'XL("-\X34(``T9O;RU"87(M,"XP,2YT87(`[5K_3QI)%/=7YZ]XU39H(BN[ |