[svn:parrot] r41762 - in branches/detect_llvm: config/auto t/steps/auto

[jkeenan at svn.parrot.org]

Author: jkeenan
Date: Thu Oct  8 02:32:29 2009
New Revision: 41762
URL: https://trac.parrot.org/parrot/changeset/41762

Log:
Correct syntax errors.  Make test work better.

Modified:
   branches/detect_llvm/config/auto/llvm.pm
   branches/detect_llvm/t/steps/auto/gcc-01.t
   branches/detect_llvm/t/steps/auto/llvm-01.t

Modified: branches/detect_llvm/config/auto/llvm.pm
==============================================================================
--- branches/detect_llvm/config/auto/llvm.pm	Thu Oct  8 02:11:09 2009	(r41761)
+++ branches/detect_llvm/config/auto/llvm.pm	Thu Oct  8 02:32:29 2009	(r41762)
@@ -121,7 +121,8 @@
                 }
                 else {
                     eval {
-                        system(qq{$conf->data->get('cc')  $sfile -o $nativefile});
+                        my $cc = $conf->data->get('cc');
+                        system(qq{$cc $sfile -o $nativefile});
                     };
                     if ( $@ or (! -e $nativefile) ) {
                         print "Unable to assemble native assembly into program\n"
@@ -147,7 +148,7 @@
         foreach my $f ( $bcfile, $sfile, $nativefile ) {
           unlink $f if ( -e $f );
         }
-        cc_clean( $conf );
+        $conf->cc_clean();
     }
 
     return 1;

Modified: branches/detect_llvm/t/steps/auto/gcc-01.t
==============================================================================
--- branches/detect_llvm/t/steps/auto/gcc-01.t	Thu Oct  8 02:11:09 2009	(r41761)
+++ branches/detect_llvm/t/steps/auto/gcc-01.t	Thu Oct  8 02:32:29 2009	(r41762)
@@ -32,7 +32,7 @@
 my $serialized = $conf->pcfreeze();
 
 test_step_thru_runstep($conf, q{init::defaults}, $args);
-test_step_thru_runstep( $conf, q{inter::progs},  $args );
+test_step_thru_runstep($conf, q{inter::progs},   $args);
 
 my $pkg = q{auto::gcc};
 

Modified: branches/detect_llvm/t/steps/auto/llvm-01.t
==============================================================================
--- branches/detect_llvm/t/steps/auto/llvm-01.t	Thu Oct  8 02:11:09 2009	(r41761)
+++ branches/detect_llvm/t/steps/auto/llvm-01.t	Thu Oct  8 02:32:29 2009	(r41762)
@@ -5,14 +5,17 @@
 
 use strict;
 use warnings;
-use Test::More tests =>  14;
+use Test::More tests =>  27;
 use Carp;
 use lib qw( lib t/configure/testlib );
+use_ok('config::init::defaults');
+use_ok('config::inter::progs');
 use_ok('config::auto::llvm');
 use Parrot::Configure;
 use Parrot::Configure::Options qw( process_options );
 use Parrot::Configure::Test qw(
     test_step_thru_runstep
+    rerun_defaults_for_testing
     test_step_constructor_and_description
 );
 use IO::CaptureOutput qw( capture );
@@ -26,12 +29,14 @@
 
 my $conf = Parrot::Configure->new;
 
-my $pkg = q{auto::llvm};
+my $serialized = $conf->pcfreeze();
 
-$conf->add_steps($pkg);
+test_step_thru_runstep($conf, q{init::defaults}, $args);
+test_step_thru_runstep( $conf, q{inter::progs},  $args );
 
-my $serialized = $conf->pcfreeze();
+my $pkg = q{auto::llvm};
 
+$conf->add_steps($pkg);
 $conf->options->set( %{$args} );
 my $step = test_step_constructor_and_description($conf);
 my $ret = $step->runstep($conf);
@@ -47,6 +52,8 @@
     argv => [ q{--verbose} ],
     mode => q{configure},
 } );
+rerun_defaults_for_testing($conf, $args );
+$conf->add_steps($pkg);
 $conf->options->set( %{$args} );
 $step = test_step_constructor_and_description($conf);
 {