Ticket #2116: nci-errors.patch

t/library/nciutils.t

@@ -15 +15 @@
 
 =cut
 
+.include 'iglobals.pasm'
+
 .sub 'main' :main
     load_bytecode 'Test/More.pbc'
 
     .local pmc exports, curr_namespace, test_namespace
     curr_namespace = get_namespace
     test_namespace = get_namespace ['Test';'More']
-    exports        = split ' ', 'plan diag ok nok is todo'
+    exports        = split ' ', 'plan diag ok nok is todo skip_all'
     test_namespace.'export_to'(curr_namespace, exports)
 
+    $P0 = getinterp
+    $P1 = $P0[.IGLOBALS_CONFIG_HASH]
+    $I1 = $P1['HAS_EXTRA_NCI_THUNKS']
+    if $I1 == 1 goto have_enough_nci
+    $I1 = $P1['HAS_LIBFFI']
+    if $I1 == 1 goto have_enough_nci
+
+    skip_all('No NCI thunks')
+    exit 0
+
+  have_enough_nci:
     ##  set our plan
     plan(13)
 

t/library/pcre.t

@@ -7 +7 @@
 
 use Test::More;
 use Parrot::Test tests => 2;
+use Parrot::Config qw(%PConfig);
 
 =head1 NAME
 
@@ -44 +45 @@
     skip( 'no pcre-config', Test::Builder->new()->expected_tests() )
         unless $has_pcre;
 
+    unless ($PConfig{HAS_EXTRA_NCI_THUNKS} || $PConfig{HAS_LIBFFI}) {
+        skip( 'Parrot built without libffi or extra NCI thunks',
+              Test::Builder->new()->expected_tests() );
+    }
+
 ## 1
 ## Check that the library can be loaded and initialized,
 ## diganose the failure otherwise.

t/pmc/nci.t

@@ -32 +32 @@
 $ENV{TEST_PROG_ARGS} ||= '';
 
 SKIP: {
+    unless ($PConfig{HAS_EXTRA_NCI_THUNKS} || $PConfig{HAS_LIBFFI}) {
+        plan skip_all => "Parrot built without libffi or extra NCI thunks";
+    }
     unless ( -e "runtime/parrot/dynext/libnci_test$PConfig{load_ext}" ) {
         plan skip_all => "Please make libnci_test$PConfig{load_ext}";
     }