@@ -292,7 +292,7 @@ sub init_test
292292
293293 if ($current_suite =~ / valgrind/ ) {
294294 safe_Mkdir(' -p' ,$valgrind_dir );
295- $insert_command = " $ENV {INFO_RDRIVE}/ref/valgrind/v3.16.0/efi2/bin/valgrind --leak-check=full --show-leak-kinds=all --trace-children=yes --log-file=$valgrind_dir /v.%basename_t .%%p .log" ;
295+ $insert_command = " $ENV {INFO_RDRIVE}/ref/valgrind/v3.16.0/efi2/bin/valgrind --leak-check=full --show-leak-kinds=all --trace-children=yes --log-file=$valgrind_dir /v.$current_test .%%p .log" ;
296296 }
297297
298298 return PASS;
@@ -399,8 +399,7 @@ sub run_and_parse
399399 extract_perf_results();
400400 }
401401 if ($current_suite =~ / valgrind/ ) {
402- my $test_basename = $test_info -> {" short_name" };
403- my @log_list = alloy_find($valgrind_dir , " v\. $test_basename \. [0-9]{1,}\. log" );
402+ my @log_list = alloy_find($valgrind_dir , " v\. $current_test \. [0-9]{1,}\. log" );
404403 if ( scalar (@log_list ) > 0 ) {
405404 $execution_output .= " \n VALGRIND reports problems. Check the following log files for detailed report:\n " ;
406405 foreach my $log (@log_list ) {
@@ -420,7 +419,7 @@ sub run_and_parse
420419 my $execution_output_ori = $execution_output ;
421420 $compiler_output = ' ' ;
422421 $execution_output = ' ' ;
423- process_logs(\&finalize_test, $valgrind_dir , $test_basename , $RUNFAIL );
422+ process_logs(\&finalize_test, $valgrind_dir , $current_test , $RUNFAIL );
424423 # Recover compilation and execution output
425424 $execution_output = $execution_output_ori ;
426425 $compiler_output = $compiler_output_ori ;
0 commit comments