Permalink
Browse files

[TEST] t/harness: Resolve conflict between branches

  • Loading branch information...
2 parents cab5aca + 24a4fa9 commit 6400e90e3b097e4309e2147cdcc44d19e1ae9d8e @japhb japhb committed Nov 3, 2009
Showing with 15 additions and 4 deletions.
  1. +2 −0 TODO
  2. +2 −2 metadata/markdown.json
  3. +9 −0 src/lib/Glue.pir
  4. +2 −2 t/harness
View
2 TODO
@@ -84,6 +84,8 @@ Metadata:
Plumage:
--------
+* Bootstrap:
+ * Switch to Configure.pir, no NQP needed
* Hosting:
* allison looking into parrot.org
* moritz gave access to a Debian Lenny box
View
@@ -22,7 +22,7 @@
"type" : "repository"
},
"configure": {
- "type" : "perl5_configure"
+ "type" : "parrot_configure"
},
"build" : {
"type" : "make"
@@ -38,7 +38,7 @@
"provides" : ["markdown"],
"requires" : {
"fetch" : ["git"],
- "configure": ["perl5"],
+ "configure": [],
"build" : ["perl5", "make"],
"test" : ["perl5", "make"],
"install" : ["perl5", "make"],
View
@@ -53,6 +53,7 @@ Glue.pir - Rakudo "glue" builtins (functions/globals) converted for NQP
$result := call_flattened(&code, $mixed, @args, $list, ...);
# Global variables;
+ our $EXECUTABLE_NAME;
our $PROGRAM_NAME;
our @ARGS;
our %ENV;
@@ -677,6 +678,10 @@ it with C<as_array()> first, like so:
=over 4
+=item $EXECUTABLE_NAME
+
+Full path of interpreter executable
+
=item $PROGRAM_NAME
Name of running program (argv[0] in C)
@@ -722,6 +727,10 @@ Operating system version
set_hll_global '$PROGRAM_NAME', $P2
set_hll_global '@ARGS', $P1
+ $S0 = interpinfo .INTERPINFO_EXECUTABLE_FULLNAME
+ $P0 = box $S0
+ set_hll_global '$EXECUTABLE_NAME', $P0
+
$P0 = root_new ['parrot';'Env']
set_hll_global '%ENV', $P0
View
@@ -1,7 +1,7 @@
#! nqp
+our $EXECUTABLE_NAME;
our @ARGS;
-our $PROGRAM_NAME;
MAIN();
# TAP grammar in ABNF
@@ -24,7 +24,7 @@ sub MAIN () {
print($filename ~ '...');
my $file := slurp($_);
- my $test_output := qx($PROGRAM_NAME, $filename);
+ my $test_output := qx($EXECUTABLE_NAME, $filename);
my $output := split("\n",$test_output);
my @plan_parts := split('..',$output[0]);

0 comments on commit 6400e90

Please sign in to comment.