cvs commit: parrot/languages/imcc TestCompiler.pm

[Leopold Toetsch]

cvsuser     03/10/04 08:28:46

  Modified:    config/gen/makefiles imcc.in
               languages/imcc TestCompiler.pm
  Log:
  cleanup; testclean target
  
  Revision  Changes    Path
  1.34      +7 -4      parrot/config/gen/makefiles/imcc.in
  
  Index: imcc.in
  ===================================================================
  RCS file: /cvs/public/parrot/config/gen/makefiles/imcc.in,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -w -r1.33 -r1.34
  --- imcc.in   2 Oct 2003 14:24:17 -0000       1.33
  +++ imcc.in   4 Oct 2003 15:28:39 -0000       1.34
  @@ -4,12 +4,15 @@
   all :
        @echo "Don't make imcc, make parrot"
   
  -clean:
  -     $(RM_F) core \
  -             *${o} \
  -             imcparser.output \
  +testclean:
  +     $(RM_F)  \
                t/*/*.out t/*/*.imc \
                t/*/*.pbc t/*/*.o t/*/*.stabs.s t/*/*.pasm
  +
  +clean:       testclean
  +     $(RM_F) core \
  +             *${o} \
  +             imcparser.output
   
   realclean: clean
   
  
  
  
  1.14      +7 -12     parrot/languages/imcc/TestCompiler.pm
  
  Index: TestCompiler.pm
  ===================================================================
  RCS file: /cvs/public/parrot/languages/imcc/TestCompiler.pm,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -w -r1.13 -r1.14
  --- TestCompiler.pm   2 Oct 2003 17:13:39 -0000       1.13
  +++ TestCompiler.pm   4 Oct 2003 15:28:46 -0000       1.14
  @@ -1,6 +1,6 @@
   package TestCompiler;
   use strict;
  -use lib '../../lib';
  +use lib '../../lib'; # XXX
   use vars qw(@EXPORT @ISA);
   use Parrot::Config;
   require Exporter;
  @@ -39,7 +39,7 @@
   my $count = 0;
   
   sub generate_functions {
  -  my ($package, $directory) = @_;
  +  my ($package) = @_;
   
     sub slurp_file {
       open SLURP, "< $_[0]";
  @@ -90,24 +90,19 @@
        my $TEST_PROG_ARGS = $ENV{TEST_PROG_ARGS} || '';
        my $s = $PConfig{slash};
        my $exe = $PConfig{exe};
  -     my $IMCC = $ENV{IMCC} || "..${s}..${s}parrot$exe";      # XXX
  -     # If $ENV{IMCC} is set from root Makefile, adjust the path.
  +     my $PARROT = $ENV{PARROT} || "..${s}..${s}parrot$exe";  # XXX
   
        if ($gen_pasm) {
  -         $TEST_PROG_ARGS =~ s/-O.//;
  -         system("$IMCC ${TEST_PROG_ARGS} $opt -o $out_f $by_f");
  +         system("$PARROT $opt -o $out_f $by_f");
        }
        elsif ($TEST_PROG_ARGS =~ /-c/) {
            my $pbc_f = per_test('.pbc',$count);
            $TEST_PROG_ARGS =~ s/-c//;
  -         system("$IMCC ${TEST_PROG_ARGS} -o $pbc_f $by_f");
  -         # system("$IMCC -r ${TEST_PROG_ARGS} $pbc_f >$out_f");
  -         Parrot::Test::_run_command("$IMCC -r ${TEST_PROG_ARGS} $pbc_f",
  +         Parrot::Test::_run_command("$PARROT ${TEST_PROG_ARGS} -o $pbc_f -r -r 
$by_f",
                STDOUT => $out_f, STDERR => $out_f);
        }
        else {
  -         #system("$IMCC -r ${TEST_PROG_ARGS} $by_f >$out_f");
  -         Parrot::Test::_run_command("$IMCC ${TEST_PROG_ARGS} $by_f",
  +         Parrot::Test::_run_command("$PARROT ${TEST_PROG_ARGS} $by_f",
                STDOUT => $out_f, STDERR => $out_f);
        }
   
  @@ -124,7 +119,7 @@
     }
   }
   
  -generate_functions(caller, "./");
  +generate_functions(caller);
   
   # vim:set sw=4:
   1;