Merge pull request intel#316 from tcreech-intel/hds-clx-5-tr3-topic

tcreech-intel · web-flow · commit 8d7763145293 · 2021-10-26T08:32:23.000-04:00
CMPLRLLVM-29952: add bin-llvm to PATH for SYCL testing
diff --git a/llvm_test_suite_sycl.pl b/llvm_test_suite_sycl.pl
@@ -302,6 +302,14 @@ sub set_tool_path
     }
     my $env_path = join($path_sep, $tool_path, $ENV{PATH});
     set_envvar("PATH", $env_path, join($path_sep, $tool_path, '$PATH'));
+
+    # For the product compiler, add the internal "bin-llvm" directory to PATH.
+    if ($compiler =~ /xmain/) {
+        my $llvm_dir = dirname(qx/dpcpp -print-prog-name=llvm-ar/);
+        my $llvm_path = join($path_sep, $llvm_dir, $ENV{PATH});
+        set_envvar("PATH", $env_path, join($path_sep, $llvm_path, '$PATH'));
+    }
+
 }
 
 sub get_info

Original file line number	Diff line number	Diff line change
`@@ -302,6 +302,14 @@ sub set_tool_path`
`302`	`302`	`}`
`303`	`303`	`my $env_path = join($path_sep, $tool_path, $ENV{PATH});`
`304`	`304`	`set_envvar("PATH", $env_path, join($path_sep, $tool_path, '$PATH'));`
	`305`	`+`
	`306`	`+ # For the product compiler, add the internal "bin-llvm" directory to PATH.`
	`307`	`+ if ($compiler =~ /xmain/) {`
	`308`	`+ my $llvm_dir = dirname(qx/dpcpp -print-prog-name=llvm-ar/);`
	`309`	`+ my $llvm_path = join($path_sep, $llvm_dir, $ENV{PATH});`
	`310`	`+ set_envvar("PATH", $env_path, join($path_sep, $llvm_path, '$PATH'));`
	`311`	`+ }`
	`312`	`+`
`305`	`313`	`}`
`306`	`314`
`307`	`315`	`sub get_info`