diff options
author | Daniel Stenberg <daniel@haxx.se> | 2005-05-20 11:24:55 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2005-05-20 11:24:55 +0000 |
commit | bee7b874ead3edb34870e76ac9e8a8d397c3b4b7 (patch) | |
tree | 74de59267085285f3b231b8139d87f95acc4ab47 /tests/testcurl.pl | |
parent | 9c3fc592f7d5388c4c149e41047c2d0c41ec9036 (diff) |
added -nobuildconf
Diffstat (limited to 'tests/testcurl.pl')
-rwxr-xr-x | tests/testcurl.pl | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/tests/testcurl.pl b/tests/testcurl.pl index 12f52b109..77cec503d 100755 --- a/tests/testcurl.pl +++ b/tests/testcurl.pl @@ -46,6 +46,7 @@ # --mktarball=[command] Command to run after completed test # --name=[name] Set name to report as # --nocvsup Don't update from CVS even though it is a CVS tree +# --nobuildconf Don't run buildconf # --runtestopts=[options] Options to pass to runtests.pl # --setup=[file name] File name to read setup from (deprecated) # --target=[your os] Specify your target environment. @@ -64,7 +65,7 @@ use vars qw($version $fixed $infixed $CURLDIR $CVS $pwd $build $buildlog $buildlogname $configurebuild $targetos $confsuffix $binext $libext); use vars qw($name $email $desc $confopts $runtestopts $setupfile $mktarball - $nocvsup $crosscompile); + $nocvsup $nobuildconf $crosscompile); # version of this script $version='$Revision$'; @@ -101,6 +102,10 @@ while ($ARGV[0]) { $nocvsup=1; shift @ARGV; } + elsif ($ARGV[0] =~ /--nobuildconf/) { + $nobuildconf=1; + shift @ARGV; + } elsif ($ARGV[0] =~ /--crosscompile/) { $crosscompile=1; shift @ARGV; @@ -348,11 +353,14 @@ if ($CVS) { mydie "failed to update from CVS ($cvsstat), exiting"; } - # remove possible left-overs from the past - unlink "configure"; - unlink "autom4te.cache"; + if($nobuildconf) { + logit "told to not run buildconf"; + } + elsif ($configurebuild) { + # remove possible left-overs from the past + unlink "configure"; + unlink "autom4te.cache"; - if ($configurebuild) { # generate the build files logit "invoke buildconf, but filter off the silly aclocal warnings"; open(F, "./buildconf 2>&1 |") or die; @@ -395,9 +403,9 @@ if ($CVS) { if ($configurebuild) { if (-f "configure") { - logit "configure created"; + logit "configure created (at least it exists)"; } else { - mydie "no configure created"; + mydie "no configure created/found"; } } else { logit "configure created (dummy message)"; # dummy message to feign success |