Index: lib/Parrot/Test/PIR_PGE.pm
===================================================================
--- lib/Parrot/Test/PIR_PGE.pm	(revision 17522)
+++ lib/Parrot/Test/PIR_PGE.pm	(working copy)
@@ -33,7 +33,7 @@
     my $parrotdir = dirname $self->{parrot};
 
 
-    my $args = $ENV{TEST_PROG_ARGS} || '';
+    my $args = $ENV{PARROT_ARGS} || '';
 
     $lang_f = File::Spec->rel2abs($lang_f);
     $out_f  = File::Spec->rel2abs($out_f);
Index: lib/Parrot/Test/Perl6.pm
===================================================================
--- lib/Parrot/Test/Perl6.pm	(revision 17522)
+++ lib/Parrot/Test/Perl6.pm	(working copy)
@@ -114,7 +114,7 @@
             my ( $test_num, $f_out, $f_code ) = set_test_info();
 
             ## get test arguments from environment
-            my $args = $ENV{TEST_PROG_ARGS} || '';
+            my $args = $ENV{PARROT_ARGS} || '';
 
             Parrot::Test::write_code_to_file( $code, $f_code );
 
Index: lib/Parrot/Test/APL.pm
===================================================================
--- lib/Parrot/Test/APL.pm	(revision 17522)
+++ lib/Parrot/Test/APL.pm	(working copy)
@@ -29,7 +29,7 @@
     my $out_f  = Parrot::Test::per_test( '.out', $count );
     my $parrotdir = dirname $self->{parrot};
 
-    my $args = $ENV{TEST_PROG_ARGS} || '';
+    my $args = $ENV{PARROT_ARGS} || '';
 
     $lang_f = File::Spec->rel2abs($lang_f);
     $out_f  = File::Spec->rel2abs($out_f);
Index: lib/Parrot/Test/Cardinal.pm
===================================================================
--- lib/Parrot/Test/Cardinal.pm	(revision 17522)
+++ lib/Parrot/Test/Cardinal.pm	(working copy)
@@ -37,7 +37,7 @@
 
     Parrot::Test::write_code_to_file( $code, $lang_f );
 
-    my $args = $ENV{TEST_PROG_ARGS} || '';
+    my $args = $ENV{PARROT_ARGS} || '';
 
     my $ruby_cmd       = "ruby $lang_f";
     my $ruby_exit_code = Parrot::Test::run_command(
Index: lib/Parrot/Test/Punie.pm
===================================================================
--- lib/Parrot/Test/Punie.pm	(revision 17522)
+++ lib/Parrot/Test/Punie.pm	(working copy)
@@ -29,7 +29,7 @@
     my $out_f  = Parrot::Test::per_test( '.out', $count );
     my $parrotdir = dirname $self->{parrot};
 
-    my $args = $ENV{TEST_PROG_ARGS} || '';
+    my $args = $ENV{PARROT_ARGS} || '';
 
     $lang_f = File::Spec->rel2abs($lang_f);
     $out_f  = File::Spec->rel2abs($out_f);
Index: lib/Parrot/Test/Harness.pm
===================================================================
--- lib/Parrot/Test/Harness.pm	(revision 17522)
+++ lib/Parrot/Test/Harness.pm	(working copy)
@@ -62,8 +62,8 @@
         if $options{compiler};
 
     # Per Leo on 18APR2005, run the test suite with --gc-debug
-    if ( $ENV{TEST_PROG_ARGS} && $ENV{TEST_PROG_ARGS} !~ /\b--gc-debug\b/ ) {
-        $ENV{TEST_PROG_ARGS} .= " --gc-debug";
+    if ( $ENV{PARROT_ARGS} && $ENV{PARROT_ARGS} !~ /\b--gc-debug\b/ ) {
+        $ENV{PARROT_ARGS} .= " --gc-debug";
     }
 }
 
Index: lib/Parrot/Test.pm
===================================================================
--- lib/Parrot/Test.pm	(revision 17522)
+++ lib/Parrot/Test.pm	(working copy)
@@ -420,7 +420,7 @@
             }
 
             # honor opt* filename to actually run code with -Ox
-            my $args = $ENV{TEST_PROG_ARGS} || '';
+            my $args = $ENV{PARROT_ARGS} || '';
             my $opt = $code_f =~ m!opt(.)! ? "-O$1" : "";
             $args .= " $opt";
 
@@ -552,7 +552,7 @@
             my $out_f = per_test( '.pasm', $test_no );
 
             my $opt = $code_f =~ m!opt(.)! ? "-O$1" : "-O1";
-            my $args = $ENV{TEST_PROG_ARGS} || '';
+            my $args = $ENV{PARROT_ARGS} || '';
             $args .= " $opt --output=$out_f";
             $args =~ s/--run-exec//;
 
Index: t/pmc/sub.t
===================================================================
--- t/pmc/sub.t	(revision 17522)
+++ t/pmc/sub.t	(working copy)
@@ -931,7 +931,7 @@
 .end
 CODE
     my $descr = ':immediate, :postcomp';
-    if ( exists $ENV{TEST_PROG_ARGS} and $ENV{TEST_PROG_ARGS} =~ m/-r/ ) {
+    if ( exists $ENV{PARROT_ARGS} and $ENV{PARROT_ARGS} =~ m/-r/ ) {
         pir_output_is( $code, <<'OUT', $descr );
 initial
 initial
Index: t/pmc/namespace.t
===================================================================
--- t/pmc/namespace.t	(revision 17522)
+++ t/pmc/namespace.t	(working copy)
@@ -635,7 +635,7 @@
 SKIP:
 {
     skip( "immediate test, doesn't with -r (from .pbc)", 1 )
-        if ( exists $ENV{TEST_PROG_ARGS} and $ENV{TEST_PROG_ARGS} =~ m/-r/ );
+        if ( exists $ENV{PARROT_ARGS} and $ENV{PARROT_ARGS} =~ m/-r/ );
 
     pir_output_is( <<'CODE', <<'OUTPUT', "find_global in current" );
 .HLL 'bork', ''
Index: t/compilers/tge/harness
===================================================================
--- t/compilers/tge/harness	(revision 17522)
+++ t/compilers/tge/harness	(working copy)
@@ -12,8 +12,8 @@
 
 # Per Leo on 18APR2005, run the test suite with --gc-debug
 
-if ($ENV{TEST_PROG_ARGS} && $ENV{TEST_PROG_ARGS} !~ /\b--gc-debug\b/) {
-  $ENV{TEST_PROG_ARGS} .= " --gc-debug"; 
+if ($ENV{PARROT_ARGS} && $ENV{PARROT_ARGS} !~ /\b--gc-debug\b/) {
+  $ENV{PARROT_ARGS} .= " --gc-debug"; 
 }
 
 if (@ARGV) {
Index: t/compilers/imcc/syn/tail.t
===================================================================
--- t/compilers/imcc/syn/tail.t	(revision 17522)
+++ t/compilers/imcc/syn/tail.t	(working copy)
@@ -12,7 +12,7 @@
 ##############################
 # Parrot Calling Conventions:  Tail call optimization.
 
-$ENV{TEST_PROG_ARGS} = '-Oc';
+$ENV{PARROT_ARGS} = '-Oc';
 
 pir_output_is( <<'CODE', <<'OUT', "tail call optimization, final position" );
 .sub _main :main
Index: t/harness
===================================================================
--- t/harness	(revision 17522)
+++ t/harness	(working copy)
@@ -109,7 +109,7 @@
 my $run_exec = grep { $_ eq '--run-exec' } @ARGV;
 @ARGV = grep { $_ ne '--run-exec' } @ARGV;
 
-# Suck the short options into the TEST_PROG_ARGS evar:
+# Suck the short options into the PARROT_ARGS evar:
 my %opts;
 getopts('wgjPCSefbvdr?hO:D:', \%opts);
 if ($opts{'?'} || $opts{h}) {
@@ -144,7 +144,7 @@
 $args .= ' --gc-debug'    if $gc_debug;
 # XXX find better way for passing run_exec to Parrot::Test
 $args .= ' --run-exec'    if $run_exec; 
-$ENV{TEST_PROG_ARGS} = $args;
+$ENV{PARROT_ARGS} = $args;
 
 # Pass in a list of tests to run on the command line, else run all the tests.
 my @default_tests = map {glob "t/$_/*.t"} qw(
Index: t/examples/shootout.t
===================================================================
--- t/examples/shootout.t	(revision 17522)
+++ t/examples/shootout.t	(working copy)
@@ -95,7 +95,7 @@
         $args .= " < $input ";
     }
 
-    $ENV{TEST_PROG_ARGS} = $args;
+    $ENV{PARROT_ARGS} = $args;
     example_output_is( $file, $expected );
 }
 
Index: languages/m4/t/builtins/001_all.t
===================================================================
--- languages/m4/t/builtins/001_all.t	(revision 17522)
+++ languages/m4/t/builtins/001_all.t	(working copy)
@@ -59,7 +59,7 @@
 
 # all macros with '--prefix_builtins
 {
-  $ENV{TEST_PROG_ARGS} = '--prefix-builtins'; 
+  $ENV{PARROT_ARGS} = '--prefix-builtins'; 
   language_output_is( 'm4', << 'END_CODE', << 'END_OUT', 'all macros with --prefix-builtins' );
 Hello World
 Hallo Welt
Index: languages/m4/lib/Parrot/Test/M4/Gnu.pm
===================================================================
--- languages/m4/lib/Parrot/Test/M4/Gnu.pm	(revision 17522)
+++ languages/m4/lib/Parrot/Test/M4/Gnu.pm	(working copy)
@@ -21,7 +21,7 @@
     my $self = shift;
     my ( $path_to_parrot, $path_to_language, $count ) = @_;
 
-    my $test_prog_args = $ENV{TEST_PROG_ARGS} || q{};
+    my $test_prog_args = $ENV{PARROT_ARGS} || q{};
     my $lang_fn = Parrot::Test::per_test( '.m4', $count );
 
     return ("$ENV{PARROT_M4_TEST_PROG} $test_prog_args ${lang_fn}");
Index: languages/m4/lib/Parrot/Test/M4/PIR.pm
===================================================================
--- languages/m4/lib/Parrot/Test/M4/PIR.pm	(revision 17522)
+++ languages/m4/lib/Parrot/Test/M4/PIR.pm	(working copy)
@@ -22,7 +22,7 @@
     my $self = shift;
     my ( $path_to_parrot, $path_to_language, $count ) = @_;
 
-    my $test_prog_args = $ENV{TEST_PROG_ARGS} || q{};
+    my $test_prog_args = $ENV{PARROT_ARGS} || q{};
     my $lang_fn = Parrot::Test::per_test( '.m4', $count );
 
     return (
Index: languages/APL/t/harness
===================================================================
--- languages/APL/t/harness	(revision 17522)
+++ languages/APL/t/harness	(working copy)
@@ -27,8 +27,8 @@
 
 # Per Leo on 18APR2005, run the test suite with --gc-debug
 
-if ($ENV{TEST_PROG_ARGS} && $ENV{TEST_PROG_ARGS} !~ /\b--gc-debug\b/) {
-  $ENV{TEST_PROG_ARGS} .= " --gc-debug"; 
+if ($ENV{PARROT_ARGS} && $ENV{PARROT_ARGS} !~ /\b--gc-debug\b/) {
+  $ENV{PARROT_ARGS} .= " --gc-debug"; 
 }
 
 if ( grep { /^--files$/ } @ARGV ) {
Index: languages/lua/t/Parrot/Test/Lua.pm
===================================================================
--- languages/lua/t/Parrot/Test/Lua.pm	(revision 17522)
+++ languages/lua/t/Parrot/Test/Lua.pm	(working copy)
@@ -56,7 +56,7 @@
         my $pir_fn  = Parrot::Test::per_test( '.pir', $count );
         my $lua_out_fn =
             Parrot::Test::per_test( $lua_test eq 'lua' ? '.orig_out' : '.parrot_out', $count );
-        my $test_prog_args = $ENV{TEST_PROG_ARGS} || q{};
+        my $test_prog_args = $ENV{PARROT_ARGS} || q{};
         my @test_prog;
         if ( $lua_test eq 'lua' ) {
             @test_prog = ( "$ENV{PARROT_LUA_TEST_PROG} ${test_prog_args} languages/${lang_fn} $params", );
Index: languages/tcl/t/harness
===================================================================
--- languages/tcl/t/harness	(revision 17522)
+++ languages/tcl/t/harness	(working copy)
@@ -28,21 +28,21 @@
 my @required_options = qw/--gc-debug -D40/;
 
 
-$ENV{TEST_PROG_ARGS} = "" unless defined($ENV{TEST_PROG_ARGS});
+$ENV{PARROT_ARGS} = "" unless defined($ENV{PARROT_ARGS});
 
 foreach my $option (@required_options) {
-  if ( $ENV{TEST_PROG_ARGS} !~ /\b$option\b/) {
-    $ENV{TEST_PROG_ARGS} .= " $option";
+  if ( $ENV{PARROT_ARGS} !~ /\b$option\b/) {
+    $ENV{PARROT_ARGS} .= " $option";
   }
 }
 
 my $DTotal = 0;
-while ($ENV{TEST_PROG_ARGS} =~ s/-D(\d*)//) {
+while ($ENV{PARROT_ARGS} =~ s/-D(\d*)//) {
   $DTotal += $1;
 }
 
 if ($DTotal) {
-  $ENV{TEST_PROG_ARGS} .= "-D$DTotal";
+  $ENV{PARROT_ARGS} .= "-D$DTotal";
 }
 
 if ( grep { /^--files$/ } @ARGV ) {
Index: languages/tcl/lib/Parrot/Test/Tcl.pm
===================================================================
--- languages/tcl/lib/Parrot/Test/Tcl.pm	(revision 17522)
+++ languages/tcl/lib/Parrot/Test/Tcl.pm	(working copy)
@@ -63,8 +63,8 @@
         my $lang_f = Parrot::Test::per_test( '.tcl', $count );
         my $out_f  = Parrot::Test::per_test( '.out', $count );
 
-        $TEST_PROG_ARGS = $ENV{TEST_PROG_ARGS} || '';
-        my $args = $TEST_PROG_ARGS;
+        $PARROT_ARGS = $ENV{PARROT_ARGS} || '';
+        my $args = $PARROT_ARGS;
 
         Parrot::Test::write_code_to_file( $code, $lang_f );
 
Index: languages/tcl/README.pod
===================================================================
--- languages/tcl/README.pod	(revision 17522)
+++ languages/tcl/README.pod	(working copy)
@@ -55,7 +55,7 @@
 =head2 Test Suite
 
 To run the test suite, type C<make test>. If any tests fail, try
-C<TEST_PROG_ARGS=-G make test>. Send the results of both to the mailing list
+C<PARROT_ARGS=-G make test>. Send the results of both to the mailing list
 C<parrot-porters@perl.org>.
 
 =head2 Documentation
Index: languages/parrot_compiler/t/basic/hello.t
===================================================================
--- languages/parrot_compiler/t/basic/hello.t	(revision 17522)
+++ languages/parrot_compiler/t/basic/hello.t	(working copy)
@@ -31,52 +31,52 @@
 
 # PASM tests
 
-$ENV{TEST_PROG_ARGS} = 'parrot.pbc';
+$ENV{PARROT_ARGS} = 'parrot.pbc';
 language_output_is( 'ParrotCompiler', $code{PASM}, $out{PASM},
-                    $ENV{TEST_PROG_ARGS} );
+                    $ENV{PARROT_ARGS} );
 
-$ENV{TEST_PROG_ARGS} = 'parrot.pasm';
+$ENV{PARROT_ARGS} = 'parrot.pasm';
 language_output_is( 'ParrotCompiler', $code{PASM}, $out{PASM},
-                    $ENV{TEST_PROG_ARGS} );
+                    $ENV{PARROT_ARGS} );
 
-$ENV{TEST_PROG_ARGS} = 'parrot_compiler.pbc --language=PASM';
+$ENV{PARROT_ARGS} = 'parrot_compiler.pbc --language=PASM';
 language_output_is( 'ParrotCompiler', $code{PASM}, $out{PASM},
-                    $ENV{TEST_PROG_ARGS} );
+                    $ENV{PARROT_ARGS} );
 
-$ENV{TEST_PROG_ARGS} = 'parrot_compiler.pbc --language=PASM';
+$ENV{PARROT_ARGS} = 'parrot_compiler.pbc --language=PASM';
 language_output_is( 'ParrotCompiler', $code{PASM}, $out{PASM},
-                    $ENV{TEST_PROG_ARGS} );
+                    $ENV{PARROT_ARGS} );
 
 TODO:
 {
   local $TODO = 'generating PASM from PIR is not supported';
-  $ENV{TEST_PROG_ARGS} = 'parrot_compiler.pasm --language=PASM';
+  $ENV{PARROT_ARGS} = 'parrot_compiler.pasm --language=PASM';
   language_output_is( 'ParrotCompiler', $code{PASM}, $out{PASM},
-                      $ENV{TEST_PROG_ARGS} );
+                      $ENV{PARROT_ARGS} );
 };
 
 # PIR tests
 
-$ENV{TEST_PROG_ARGS} = 'parrot_compiler.pbc --language=PIR';
+$ENV{PARROT_ARGS} = 'parrot_compiler.pbc --language=PIR';
 language_output_is( 'ParrotCompiler', $code{PIR}, $out{PIR},
-                    $ENV{TEST_PROG_ARGS} );
+                    $ENV{PARROT_ARGS} );
 
-$ENV{TEST_PROG_ARGS} = 'parrot_compiler.pir --language=PIR';
+$ENV{PARROT_ARGS} = 'parrot_compiler.pir --language=PIR';
 language_output_is( 'ParrotCompiler', $code{PIR}, $out{PIR},
-                    $ENV{TEST_PROG_ARGS} );
+                    $ENV{PARROT_ARGS} );
 
 TODO:
 {
   local $TODO = 'generating PASM from PIR is not supported';
-  $ENV{TEST_PROG_ARGS} = 'parrot_compiler.pasm --language=PIR';
+  $ENV{PARROT_ARGS} = 'parrot_compiler.pasm --language=PIR';
   language_output_is( 'ParrotCompiler', $code{PIR}, $out{PIR},
-                      $ENV{TEST_PROG_ARGS} );
+                      $ENV{PARROT_ARGS} );
 };
 
 TODO:
 {
   local $TODO = 'generating PASM from PIR is not supported';
-  $ENV{TEST_PROG_ARGS} = 'parrot_compiler.pasm --language=PAST';
+  $ENV{PARROT_ARGS} = 'parrot_compiler.pasm --language=PAST';
   language_output_is( 'ParrotCompiler', $code{PAST}, $out{PAST},
-                      $ENV{TEST_PROG_ARGS} );
+                      $ENV{PARROT_ARGS} );
 };
Index: languages/parrot_compiler/lib/Parrot/Test/ParrotCompiler.pm
===================================================================
--- languages/parrot_compiler/lib/Parrot/Test/ParrotCompiler.pm	(revision 17522)
+++ languages/parrot_compiler/lib/Parrot/Test/ParrotCompiler.pm	(working copy)
@@ -44,7 +44,7 @@
     my $code_f = Parrot::Test::per_test( '.code', $test_no );
     my $out_f  = Parrot::Test::per_test( '.out',  $test_no );
 
-    my $test_prog_args = $ENV{TEST_PROG_ARGS} || '';
+    my $test_prog_args = $ENV{PARROT_ARGS} || '';
     my $cmd = "$self->{parrot} languages/parrot_compiler/$test_prog_args < languages/$code_f";
 
     Parrot::Test::write_code_to_file( $code, $code_f );
Index: languages/c99/lib/Parrot/Test/C99.pm
===================================================================
--- languages/c99/lib/Parrot/Test/C99.pm	(revision 17522)
+++ languages/c99/lib/Parrot/Test/C99.pm	(working copy)
@@ -36,7 +36,7 @@
 
     Parrot::Test::write_code_to_file( $code, $lang_f );
 
-    my $args = $ENV{TEST_PROG_ARGS} || '';
+    my $args = $ENV{PARROT_ARGS} || '';
 
 #my $gcc_cmd = "gcc $lang_f";
 #my $gcc_exit_code = Parrot::Test::run_command($gcc_cmd, CD => $self->{relpath}, STDOUT => $out_f, STDERR => $out_f );