Segregate Parrot-specific tests.

Raku · Apr 14, 2013 · 9f25f51 · 9f25f51
1 parent 4c7ee83
commit 9f25f51
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 56 deletions.
diff --git a/t/pmc/qrpa.t → t/parrot-pmc/qrpa.t b/t/pmc/qrpa.t → t/parrot-pmc/qrpa.t
diff --git a/t/qast/pirt.t → t/parrot/01-pirt.t b/t/qast/pirt.t → t/parrot/01-pirt.t
diff --git a/t/parrot/02-qast.t b/t/parrot/02-qast.t
@@ -0,0 +1,67 @@
+use QAST;
+
+plan(5);
+
+# Following a test infrastructure.
+sub compile_qast($qast) {
+    my $*QAST_BLOCK_NO_CLOSE := 1;
+    nqp::getcomp('nqp').compile($qast, :from('ast'));
+}
+sub is_qast($qast, $value, $desc) {
+    try {
+        my $code := compile_qast($qast);
+        ok($code() eq $value, $desc);
+        CATCH { ok(0, $desc) }
+    }
+}
+
+is_qast(
+    QAST::Block.new(
+        QAST::VM.new(
+            parrot => QAST::IVal.new( :value(42) ),
+            unknown => QAST::IVal.new( :value(69) )
+        )
+    ),
+    42,
+    'QAST::VM picks parrot alternative and ignores others');
+
+is_qast(
+    QAST::Block.new(
+        QAST::VM.new(
+            pir => ".return ('Leffe')",
+        ),
+        QAST::SVal.new( :value('Fosters') )
+    ),
+    'Leffe',
+    'QAST::VM with pir works');
+
+is_qast(
+    QAST::Block.new(
+        QAST::VM.new(
+            pir => "%r = box 'set'",
+        )
+    ),
+    'set',
+    'QAST::VM with pir and %r works');
+
+is_qast(
+    QAST::Block.new(
+        QAST::VM.new(
+            pirop => 'add__Iii',
+            QAST::IVal.new( :value(15) ),
+            QAST::IVal.new( :value(10) )
+        )
+    ),
+    25,
+    'QAST::VM with pirop and signature after __');
+
+is_qast(
+    QAST::Block.new(
+        QAST::VM.new(
+            pirop => 'add Iii',
+            QAST::IVal.new( :value(15) ),
+            QAST::IVal.new( :value(100) )
+        )
+    ),
+    115,
+    'QAST::VM with pirop and signature after a space');
diff --git a/t/nqp/19-inline.t → t/parrot/03-inline.t b/t/nqp/19-inline.t → t/parrot/03-inline.t
diff --git a/t/nqp/30-pirop.t → t/parrot/04-pirop.t b/t/nqp/30-pirop.t → t/parrot/04-pirop.t
diff --git a/t/nqp/52-vtable.t → t/parrot/05-vtable.t b/t/nqp/52-vtable.t → t/parrot/05-vtable.t
diff --git a/t/nqp/67-errno.t → t/parrot/06-errno.t b/t/nqp/67-errno.t → t/parrot/06-errno.t
diff --git a/t/qast/qast.t → t/qast/01-qast.t b/t/qast/qast.t → t/qast/01-qast.t
@@ -1,6 +1,6 @@
 use QAST;
 
-plan(73);
+plan(68);
 
 # Following a test infrastructure.
 sub compile_qast($qast) {
@@ -919,57 +919,6 @@ test_qast_result(
         ok(SCTest.main, 'mainline OK');
     });
 
-is_qast(
-    QAST::Block.new(
-        QAST::VM.new(
-            parrot => QAST::IVal.new( :value(42) ),
-            unknown => QAST::IVal.new( :value(69) )
-        )
-    ),
-    42,
-    'QAST::VM picks parrot alternative and ignores others');
-
-is_qast(
-    QAST::Block.new(
-        QAST::VM.new(
-            pir => ".return ('Leffe')",
-        ),
-        QAST::SVal.new( :value('Fosters') )
-    ),
-    'Leffe',
-    'QAST::VM with pir works');
-
-is_qast(
-    QAST::Block.new(
-        QAST::VM.new(
-            pir => "%r = box 'set'",
-        )
-    ),
-    'set',
-    'QAST::VM with pir and %r works');
-
-is_qast(
-    QAST::Block.new(
-        QAST::VM.new(
-            pirop => 'add__Iii',
-            QAST::IVal.new( :value(15) ),
-            QAST::IVal.new( :value(10) )
-        )
-    ),
-    25,
-    'QAST::VM with pirop and signature after __');
-
-is_qast(
-    QAST::Block.new(
-        QAST::VM.new(
-            pirop => 'add Iii',
-            QAST::IVal.new( :value(15) ),
-            QAST::IVal.new( :value(100) )
-        )
-    ),
-    115,
-    'QAST::VM with pirop and signature after a space');
-
 is_qast(
     QAST::Block.new(
         QAST::Stmts.new(

diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
@@ -1095,16 +1095,16 @@ bootstrap-files: $(STAGE2_PBCS) src/stage2/$(CORE_SETTING_NQP)
 ## testing
 
 test: all
-	prove -r --exec ./$(NQP_EXE) t/nqp t/hll t/qregex t/p5regex t/qast t/serialization
+	prove -r --exec ./$(NQP_EXE) t/nqp t/parrot t/hll t/qregex t/p5regex t/qast t/serialization
 
 test-loud: all
-	prove -r -v --exec ./$(NQP_EXE) t/nqp t/hll t/qregex t/p5regex t/qast t/serialization
+	prove -r -v --exec ./$(NQP_EXE) t/nqp t/parrot t/hll t/qregex t/p5regex t/qast t/serialization
 
 core-test: $(NQP_EXE)
-	prove -r --exec ./$(NQP_EXE) t/nqp
+	prove -r --exec ./$(NQP_EXE) t/nqp t/parrot
 
 core-test-loud: $(NQP_EXE)
-	prove -r -v --exec ./$(NQP_EXE) t/nqp
+	prove -r -v --exec ./$(NQP_EXE) t/nqp t/parrot
 
 qregex-test: $(NQP_EXE)
 	prove -r --exec ./$(NQP_EXE) t/qregex