hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Zipmerge: allow test to be run from internal repo

Browse Source
This commit is contained in:
Paolo Tranquilli
2024-05-28 17:37:34 +02:00
parent 4094db40b8
commit 332d178298
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
misc/bazel/internal/zipmerge/zipmerge_test.cpp
View File

@@ -5,6 +5,7 @@
#include <sstream>
#include <string>
#include <cstring>
#include <filesystem>
#include <gtest/gtest.h>
#include <gmock/gmock.h>
@@ -12,6 +13,7 @@
using bazel::tools::cpp::runfiles::Runfiles;
using namespace std::string_literals;
namespace fs = std::filesystem;
namespace codeql_testing {
@@ -72,7 +74,15 @@ std::string get_file(const char* name) {
EXPECT_TRUE(ret) << error;
return ret;
}();
return runfiles->Rlocation("_main/misc/bazel/internal/zipmerge/test-files/"s + name);
// this works from both `codeql` and the internal repository
for (auto prefix : {"_main", "codeql~"}) {
auto ret = runfiles->Rlocation(prefix + "/misc/bazel/internal/zipmerge/test-files/"s + name);
if (fs::exists(ret)) {
return ret;
}
}
EXPECT_TRUE(false) << "test file " << name << " not found";
return "";
}
void expect_same_file(const char* actual, const char* expected) {