AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWDEV-273235 - catch2 windows build (#2422)

Browse Source 
Change-Id: I331c6c2525a65746e2d0799ec8dc2f608af1176a
This commit is contained in:
agunashe
2021-11-25 22:22:46 -08:00
committed by GitHub
parent f90c5d218c
commit 3ccd6ec300
16 changed files with 178 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
catch/hipTestMain/hip_test_context.cc
+2 -12
View File
@@ -2,18 +2,8 @@
#include <picojson.h>
#include <fstream>
#include <sstream>
#if __has_include(<filesystem>)
#include <filesystem>
namespace fs = std::filesystem;
#elif __has_include(<experimental/filesystem>)
#include <experimental/filesystem>
namespace fs = std::experimental::filesystem;
#else
#error "gg filesystem"
#endif
#include <regex>
#include "hip_test_filesystem.hh"
void TestContext::detectOS() {
#if (HT_WIN == 1)
@@ -49,7 +39,7 @@ void TestContext::fillConfig() {
if (config_path.has_parent_path() && config_path.has_filename()) {
config_.json_file = config_str;
} else if (config_path.has_parent_path()) {
config_.json_file = config_path / def_config_json;
config_.json_file = config_path.string() + def_config_json;
} else {
config_.json_file = exe_path + def_config_json;
}