Skip to content

Commit 05c96d8

Browse files
Merge pull request intel#1126 from rongxizhang97/shliclel614-sycltb-topic
[CMPLRTST-17804] Fix the issue for valgrind sycl test reporting wrong test name to Failboard
2 parents 2dbc002 + a7ca331 commit 05c96d8

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

llvm_test_suite_sycl.pl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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 .= "\nVALGRIND 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

Comments
 (0)