josh/phoronix-test-suite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pts-core: Fixes for running on openSUSE

Browse Source
This commit is contained in:
Michael Larabel
2024-09-14 18:14:53 -05:00
parent 137aff0047
commit e1bc468707
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pts-core/external-test-dependencies/xml/opensuse-packages.xml
View File

@@ -66,7 +66,7 @@
</Package>
<Package>
<GenericName>p7zip</GenericName>
<PackageName>p7zip-full</PackageName>
<PackageName>7zip</PackageName>
</Package>
<Package>
<GenericName>bison</GenericName>

5
pts-core/objects/client/pts_client.php
View File

@@ -1821,6 +1821,11 @@ class pts_client
$path .= ':' . $d;
}
}
foreach(pts_file_io::glob('/usr/lib*/mpi/*/*/bin/') as $mpi_bin_path)
{
// openSUSE has e.g. /usr/lib64/mpi/gcc/openmpi4/bin for mpicxx that otherwise is not appearing in default PATH on modern Tumbleweed
$path .= ':' . $mpi_bin_path;
}
}
return $path;

5
pts-core/objects/client/pts_test_installer.php
View File

@@ -755,6 +755,11 @@ class pts_test_installer
$test_install_request->compiler_mask_dir = $mask_dir;
// Appending the rest of the path will be done automatically within call_test_script
$test_install_request->special_environment_vars['PATH'] = $mask_dir . (is_dir('/usr/lib64/openmpi/bin') ? ':/usr/lib64/openmpi/bin' : null);
foreach(pts_file_io::glob('/usr/lib*/mpi/*/*/bin/') as $mpi_bin_path)
{
// openSUSE has e.g. /usr/lib64/mpi/gcc/openmpi4/bin for mpicxx that otherwise is not appearing in default PATH on modern Tumbleweed
$test_install_request->special_environment_vars['PATH'] .= ':' . $mpi_bin_path;
}
}
// Additional workarounds