mirror of
https://github.com/KhronosGroup/OpenCL-CTS.git
synced 2026-03-19 06:09:01 +00:00
Fix file paths in test_compiler (#2523)
Add a command line argument to override the SPIR-V file paths if needed, similar to `test_spirv_new`. Set the default path to the one required by `run_conformance.py`, which assumes the current working directory to be `<build_dir>/test_conformance`. Signed-off-by: Ahmed Hesham <ahmed.hesham@arm.com>
This commit is contained in:
@@ -13,10 +13,62 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
#include <string>
|
||||
#include <filesystem>
|
||||
|
||||
#include "harness/testHarness.h"
|
||||
|
||||
std::string spvBinariesPath =
|
||||
(std::filesystem::path("compiler") / "spirv_bin").u8string();
|
||||
const std::string spvBinariesPathArg = "--spirv-binaries-path";
|
||||
|
||||
void printUsage()
|
||||
{
|
||||
log_info("Reading SPIR-V files from default '%s' path.\n",
|
||||
spvBinariesPath.c_str());
|
||||
log_info("In case you want to set other directory use '%s' argument.\n",
|
||||
spvBinariesPathArg.c_str());
|
||||
}
|
||||
|
||||
int main(int argc, const char *argv[])
|
||||
{
|
||||
bool modifiedSpvBinariesPath = false;
|
||||
bool listTests = false;
|
||||
for (int i = 0; i < argc; ++i)
|
||||
{
|
||||
int argsRemoveNum = 0;
|
||||
if (argv[i] == spvBinariesPathArg)
|
||||
{
|
||||
if (i + 1 == argc)
|
||||
{
|
||||
log_error("Missing value for '%s' argument.\n",
|
||||
spvBinariesPathArg.c_str());
|
||||
return TEST_FAIL;
|
||||
}
|
||||
else
|
||||
{
|
||||
spvBinariesPath = std::string(argv[i + 1]);
|
||||
argsRemoveNum += 2;
|
||||
modifiedSpvBinariesPath = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (argsRemoveNum > 0)
|
||||
{
|
||||
for (int j = i; j < (argc - argsRemoveNum); ++j)
|
||||
argv[j] = argv[j + argsRemoveNum];
|
||||
|
||||
argc -= argsRemoveNum;
|
||||
--i;
|
||||
}
|
||||
listTests |= (argv[i] == std::string("--list")
|
||||
|| argv[i] == std::string("-list"));
|
||||
}
|
||||
if (modifiedSpvBinariesPath == false && !listTests)
|
||||
{
|
||||
printUsage();
|
||||
}
|
||||
|
||||
return runTestHarness(argc, argv, test_registry::getInstance().num_tests(),
|
||||
test_registry::getInstance().definitions(), false, 0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user