Make NQP nativecall tests robust on Win32.

At least, with MSVC. If we don't find standard C symbols, fall back to explicitly looking in the C library.
Raku · Mar 12, 2014 · 2d19f41 · 2d19f41
1 parent 3ebb27f
commit 2d19f41
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/t/nativecall/01-basic.t b/t/nativecall/01-basic.t
@@ -47,15 +47,19 @@ BEGIN {
 class Call     is repr('NativeCall') { }
 class CPointer is repr('CPointer')   { }
 
-#my $printf := nqp::create(Call);
 my $printf := Call.new;
 $arg_hash := nqp::hash();
 $arg_hash<type> := 'utf8str';
 $arg_hash<free_str> := 1;
 $return_hash := nqp::hash();
 $return_hash<type> := 'void';
 
-nqp::buildnativecall($printf, '', 'printf', '', [$arg_hash], $return_hash);
+try {
+    nqp::buildnativecall($printf, '', 'printf', '', [$arg_hash], $return_hash);
+    CATCH {
+        nqp::buildnativecall($printf, 'msvcrt.dll', 'printf', '', [$arg_hash], $return_hash);
+    }
+}
 nqp::nativecall(nqp::null(), $printf, ["ok - printf\n"]);
 
 my $strdup := nqp::create(Call);
@@ -68,7 +72,7 @@ $return_hash<type> := 'cpointer';
 try {
     nqp::buildnativecall($strdup, '', 'strdup', '', [$arg_hash], $return_hash);
     CATCH {
-        nqp::buildnativecall($strdup, '', '_strdup', '', [$arg_hash], $return_hash);
+        nqp::buildnativecall($strdup, 'msvcrt.dll', '_strdup', '', [$arg_hash], $return_hash);
     }
 }
 my $dupped := nqp::nativecall(CPointer, $strdup, ["ok - passing cpointer\n"]);
@@ -80,7 +84,12 @@ $arg_hash<type> := 'cpointer';
 $return_hash := nqp::hash();
 $return_hash<type> := 'void';
 
-nqp::buildnativecall($printf, '', 'printf', '', [$arg_hash], $return_hash);
+try {
+    nqp::buildnativecall($printf, '', 'printf', '', [$arg_hash], $return_hash);
+    CATCH {
+        nqp::buildnativecall($printf, 'msvcrt.dll', 'printf', '', [$arg_hash], $return_hash);
+    }
+}
 nqp::nativecall(nqp::null(), $printf, [$dupped]);
 
 # vim: ft=perl6