Make the test script tag parser a bit more robust.

Check for the .exe extension on mingw32 builds.

diff --git a/tests/getpart.pm b/tests/getpart.pm
index ccfbd7d62871a9a7d6dfc6663e0780b4e0665085..9ade56a19e1061908e5accbc36dce016c3c29d22 100644 (file)
--- a/tests/getpart.pm
+++ b/tests/getpart.pm
@@ -64,7 +64,7 @@ sub getpart {
             $inside++;
         }
         elsif((1 ==$inside) && ($_ =~ /^ *\<$part[ \>]/)) {
-            if($_ =~ /$part .*base64=/) {
+            if($_ =~ /$part [^>]*base64=/) {
                 # attempt to detect base64 encoded parts
                 $base64=1;
             }

diff --git a/tests/testcurl.pl b/tests/testcurl.pl
index 8d207d1cda98d6ecefa703695077dfb63987deee..48f63369cbb581c6f2595163005f26c3c5494841 100755 (executable)
--- a/tests/testcurl.pl
+++ b/tests/testcurl.pl
@@ -133,6 +133,9 @@ if ($^O eq 'MSWin32' || $targetos) {
     $binext = '.exe';
     $libext = '.lib';
   }
+  elsif ($targetos =~ /mingw32/) {
+    $binext = '.exe';
+  }
   elsif ($targetos =~ /netware/) {
     $configurebuild = 0;
     $binext = '.nlm';