diff options
| author | Gunter Knauf <gk@gknw.de> | 2004-07-06 02:37:52 +0000 |
|---|---|---|
| committer | Gunter Knauf <gk@gknw.de> | 2004-07-06 02:37:52 +0000 |
| commit | dd4d5bb1e01573654c386027a15eba768bd21a02 (patch) | |
| tree | 7ac2c8b14f831dea7732da33131ce758f676980f | |
| parent | 842e4aaa0d780fc624f2eb3a1eb9b72e9fa789ce (diff) | |
fixed Win32 prebuild section; fixed minor cosmetic bug.
| -rwxr-xr-x | tests/testcurl.pl | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/tests/testcurl.pl b/tests/testcurl.pl index 4881b408e..4265e38a5 100755 --- a/tests/testcurl.pl +++ b/tests/testcurl.pl @@ -345,11 +345,11 @@ if ($gnulikebuild) { mydie "configure didn't work"; } } else { - if ($^O eq 'MSWin32') { + if (($^O eq 'MSWin32') && ($targetos !~ /netware/)) { system("xcopy /s /q ..\\$CURLDIR ."); system("buildconf.bat"); - } elsif ($^O eq 'linux') { - system("cp -ar ../$CURLDIR/* ."); + } elsif (($^O eq 'linux') || ($targetos =~ /netware/)) { + system("cp -afr ../$CURLDIR/* ."); system("cp -af ../$CURLDIR/Makefile.dist Makefile"); system("make -i -C lib -f Makefile.$targetos prebuild"); system("make -i -C src -f Makefile.$targetos prebuild"); @@ -387,9 +387,9 @@ if (grepfile("define USE_ARES", "lib/config$confsuffix.h")) { close(F); if (-f "libcares$libext") { - logit "ares is now built successfully (libcares.$libext)"; + logit "ares is now built successfully (libcares$libext)"; } else { - logit "ares build failed (libares.$libext)"; + logit "ares build failed (libares$libext)"; } # cd back to the curl build dir @@ -421,6 +421,12 @@ if ($gnulikebuild) { close(F); } +if (-f "lib/libcurl$libext") { + logit "lib/libcurl was created fine (libcurl$libext)"; +} else { + logit "lib/libcurl was not created (libcurl$libext)"; +} + if (-f "src/curl$binext") { logit "src/curl was created fine (curl$binext)"; } else { |