|
From: <jud...@us...> - 2006-07-20 19:49:42
|
Revision: 315 Author: judith_osdl Date: 2006-07-20 12:49:36 -0700 (Thu, 20 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=315&view=rev Log Message: ----------- Use sub_test_failure instead of ret Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Test/Single.pm Modified: trunk/Test-Sut/lib/Test/Sut/Test/Single.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Test/Single.pm 2006-07-20 17:54:59 UTC (rev 314) +++ trunk/Test-Sut/lib/Test/Sut/Test/Single.pm 2006-07-20 19:49:36 UTC (rev 315) @@ -32,6 +32,7 @@ sub run_test { my ( $self ) = @_; + $self->{'sub_test_failure'} = 0; $self->set_test_request_status( "Running" ); my $webpath = $self->getConfigParam( 'webpath' ); @@ -52,7 +53,6 @@ my $script_param = $self->{ 'tr_ref' }->{ 'test_params' } || ""; mkdir $ENV{'RESULTS'}; - my $ret = 0; makeEnvFile( $self, $self->{ 'environment' } ); chdir $test; chmod 0755, "wrap.sh"; @@ -66,13 +66,13 @@ `ls -lR`; system "echo $script_param > $ENV{'SYSTEM_LOGS'}/script_params.txt"; system ". $ENV{'TEST_ENV'}; . /usr/bin/stp_include.sh && ./wrap.sh $script_param &> $ENV{'SYSTEM_LOGS'}/run-log.txt"; - $ret = -1 unless ( $? == 0 ); + $self->{ 'sub_test_failure' } = -1 unless ( $? == 0 ); system "stp_oprofile stop"; system "stp_profile stop"; chdir ".."; - return $ret; + return $self->{ 'sub_test_failure' }; } sub generate_index { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |