Use `_repo_mapping` in C++ runfiles library Work towards #16124 Closes #16701. PiperOrigin-RevId: 487806351 Change-Id: I3b04fef84d817b0875bfd71c65efe6db13468b13
diff --git a/src/test/py/bazel/bzlmod/bazel_module_test.py b/src/test/py/bazel/bzlmod/bazel_module_test.py index b9fd786..727d3f1 100644 --- a/src/test/py/bazel/bzlmod/bazel_module_test.py +++ b/src/test/py/bazel/bzlmod/bazel_module_test.py
@@ -694,6 +694,58 @@ self.Path('bazel-bin/external/bar~2.0/bar.runfiles_manifest')) as f: self.assertIn('_repo_mapping ', f.read()) + def testCppRunfilesLibraryRepoMapping(self): + self.main_registry.setModuleBasePath('projects') + projects_dir = self.main_registry.projects + + self.main_registry.createLocalPathModule('data', '1.0', 'data') + projects_dir.joinpath('data').mkdir(exist_ok=True) + scratchFile(projects_dir.joinpath('data', 'WORKSPACE')) + scratchFile(projects_dir.joinpath('data', 'foo.txt'), ['hello']) + scratchFile( + projects_dir.joinpath('data', 'BUILD'), ['exports_files(["foo.txt"])']) + + self.main_registry.createLocalPathModule('test', '1.0', 'test', + {'data': '1.0'}) + projects_dir.joinpath('test').mkdir(exist_ok=True) + scratchFile(projects_dir.joinpath('test', 'WORKSPACE')) + scratchFile( + projects_dir.joinpath('test', 'BUILD'), [ + 'cc_test(', + ' name = "test",', + ' srcs = ["test.cpp"],', + ' data = ["@data//:foo.txt"],', + ' args = ["$(rlocationpath @data//:foo.txt)"],', + ' deps = ["@bazel_tools//tools/cpp/runfiles"],', + ')', + ]) + scratchFile( + projects_dir.joinpath('test', 'test.cpp'), [ + '#include <cstdlib>', + '#include <fstream>', + '#include "tools/cpp/runfiles/runfiles.h"', + 'using bazel::tools::cpp::runfiles::Runfiles;', + 'int main(int argc, char** argv) {', + ' Runfiles* runfiles = Runfiles::Create(argv[0], BAZEL_CURRENT_REPOSITORY);', + ' std::ifstream f1(runfiles->Rlocation(argv[1]));', + ' if (!f1.good()) std::exit(1);', + ' std::ifstream f2(runfiles->Rlocation("data/foo.txt"));', + ' if (!f2.good()) std::exit(2);', + '}', + ]) + + self.ScratchFile('MODULE.bazel', ['bazel_dep(name="test",version="1.0")']) + self.ScratchFile('WORKSPACE') + + # Run sandboxed on Linux and macOS. + exit_code, stderr, stdout = self.RunBazel( + ['test', '@test//:test', '--test_output=errors'], allow_failure=True) + self.AssertExitCode(exit_code, 0, stderr, stdout) + # Run unsandboxed on all platforms. + exit_code, stderr, stdout = self.RunBazel(['run', '@test//:test'], + allow_failure=True) + self.AssertExitCode(exit_code, 0, stderr, stdout) + def testJavaRunfilesLibraryRepoMapping(self): self.main_registry.setModuleBasePath('projects') projects_dir = self.main_registry.projects
diff --git a/tools/cpp/runfiles/runfiles_src.cc b/tools/cpp/runfiles/runfiles_src.cc index f35dd96..d81edb6 100644 --- a/tools/cpp/runfiles/runfiles_src.cc +++ b/tools/cpp/runfiles/runfiles_src.cc
@@ -96,15 +96,13 @@ bool PathsFrom(const std::string& argv0, std::string runfiles_manifest_file, std::string runfiles_dir, std::string* out_manifest, - std::string* out_directory, std::string* out_repo_mapping); + std::string* out_directory); bool PathsFrom(const std::string& argv0, std::string runfiles_manifest_file, std::string runfiles_dir, std::function<bool(const std::string&)> is_runfiles_manifest, std::function<bool(const std::string&)> is_runfiles_directory, - std::function<bool(const std::string&)> is_repo_mapping, - std::string* out_manifest, std::string* out_directory, - std::string* out_repo_mapping); + std::string* out_manifest, std::string* out_directory); bool ParseManifest(const string& path, map<string, string>* result, string* error); @@ -117,9 +115,9 @@ const string& runfiles_manifest_file, const string& runfiles_dir, const string& source_repository, string* error) { - string manifest, directory, repo_mapping; + string manifest, directory; if (!PathsFrom(argv0, runfiles_manifest_file, runfiles_dir, &manifest, - &directory, &repo_mapping)) { + &directory)) { if (error) { std::ostringstream err; err << "ERROR: " << __FILE__ << "(" << __LINE__ @@ -144,10 +142,10 @@ } map<pair<string, string>, string> mapping; - if (!repo_mapping.empty()) { - if (!ParseRepoMapping(repo_mapping, &mapping, error)) { - return nullptr; - } + if (!ParseRepoMapping( + RlocationUnchecked("_repo_mapping", runfiles, directory), &mapping, + error)) { + return nullptr; } return new Runfiles(std::move(runfiles), std::move(directory), @@ -196,28 +194,28 @@ return path; } - if (repo_mapping_.empty()) { - return RlocationUnchecked(path); - } string::size_type first_slash = path.find_first_of('/'); if (first_slash == string::npos) { - return RlocationUnchecked(path); + return RlocationUnchecked(path, runfiles_map_, directory_); } string target_apparent = path.substr(0, first_slash); auto target = repo_mapping_.find(std::make_pair(source_repo, target_apparent)); if (target == repo_mapping_.cend()) { - return RlocationUnchecked(path); + return RlocationUnchecked(path, runfiles_map_, directory_); } - return RlocationUnchecked(target->second + path.substr(first_slash)); + return RlocationUnchecked(target->second + path.substr(first_slash), + runfiles_map_, directory_); } -string Runfiles::RlocationUnchecked(const string& path) const { - const auto exact_match = runfiles_map_.find(path); - if (exact_match != runfiles_map_.end()) { +string Runfiles::RlocationUnchecked(const string& path, + const map<string, string>& runfiles_map, + const string& directory) { + const auto exact_match = runfiles_map.find(path); + if (exact_match != runfiles_map.end()) { return exact_match->second; } - if (!runfiles_map_.empty()) { + if (!runfiles_map.empty()) { // If path references a runfile that lies under a directory that itself is a // runfile, then only the directory is listed in the manifest. Look up all // prefixes of path in the manifest and append the relative path from the @@ -226,14 +224,14 @@ while ((prefix_end = path.find_last_of('/', prefix_end - 1)) != string::npos) { const string prefix = path.substr(0, prefix_end); - const auto prefix_match = runfiles_map_.find(prefix); - if (prefix_match != runfiles_map_.end()) { + const auto prefix_match = runfiles_map.find(prefix); + if (prefix_match != runfiles_map.end()) { return prefix_match->second + "/" + path.substr(prefix_end + 1); } } } - if (!directory_.empty()) { - return directory_ + "/" + path; + if (!directory.empty()) { + return directory + "/" + path; } return ""; } @@ -279,13 +277,7 @@ string* error) { std::ifstream stm(path); if (!stm.is_open()) { - if (error) { - std::ostringstream err; - err << "ERROR: " << __FILE__ << "(" << __LINE__ - << "): cannot open repository mapping \"" << path << "\""; - *error = err.str(); - } - return false; + return true; } string line; std::getline(stm, line); @@ -333,12 +325,9 @@ bool TestOnly_PathsFrom(const string& argv0, string mf, string dir, function<bool(const string&)> is_runfiles_manifest, function<bool(const string&)> is_runfiles_directory, - function<bool(const string&)> is_repo_mapping, - string* out_manifest, string* out_directory, - string* out_repo_mapping) { + string* out_manifest, string* out_directory) { return PathsFrom(argv0, mf, dir, is_runfiles_manifest, is_runfiles_directory, - is_repo_mapping, out_manifest, out_directory, - out_repo_mapping); + out_manifest, out_directory); } bool TestOnly_IsAbsolute(const string& path) { return IsAbsolute(path); } @@ -376,23 +365,19 @@ namespace { bool PathsFrom(const string& argv0, string mf, string dir, string* out_manifest, - string* out_directory, string* out_repo_mapping) { + string* out_directory) { return PathsFrom( argv0, mf, dir, [](const string& path) { return IsReadableFile(path); }, - [](const string& path) { return IsDirectory(path); }, - [](const string& path) { return IsReadableFile(path); }, out_manifest, - out_directory, out_repo_mapping); + [](const string& path) { return IsDirectory(path); }, out_manifest, + out_directory); } bool PathsFrom(const string& argv0, string mf, string dir, function<bool(const string&)> is_runfiles_manifest, function<bool(const string&)> is_runfiles_directory, - function<bool(const string&)> is_repo_mapping, - string* out_manifest, string* out_directory, - string* out_repo_mapping) { + string* out_manifest, string* out_directory) { out_manifest->clear(); out_directory->clear(); - out_repo_mapping->clear(); bool mfValid = is_runfiles_manifest(mf); bool dirValid = is_runfiles_directory(dir); @@ -428,21 +413,6 @@ dirValid = is_runfiles_directory(dir); } - string rm; - bool rmValid = false; - - if (dirValid && ends_with(dir, ".runfiles")) { - rm = dir.substr(0, dir.size() - 9) + ".repo_mapping"; - rmValid = is_repo_mapping(rm); - } - - if (!rmValid && mfValid && - (ends_with(mf, ".runfiles_manifest") || - ends_with(mf, ".runfiles/MANIFEST"))) { - rm = mf.substr(0, mf.size() - 18) + ".repo_mapping"; - rmValid = is_repo_mapping(rm); - } - if (mfValid) { *out_manifest = mf; } @@ -451,10 +421,6 @@ *out_directory = dir; } - if (rmValid) { - *out_repo_mapping = rm; - } - return true; }
diff --git a/tools/cpp/runfiles/runfiles_src.h b/tools/cpp/runfiles/runfiles_src.h index 6e0a0c2..75103e2 100644 --- a/tools/cpp/runfiles/runfiles_src.h +++ b/tools/cpp/runfiles/runfiles_src.h
@@ -206,14 +206,17 @@ Runfiles& operator=(const Runfiles&) = delete; Runfiles& operator=(Runfiles&&) = delete; + static std::string RlocationUnchecked( + const std::string& path, + const std::map<std::string, std::string>& runfiles_map, + const std::string& directory); + const std::map<std::string, std::string> runfiles_map_; const std::string directory_; const std::map<std::pair<std::string, std::string>, std::string> repo_mapping_; const std::vector<std::pair<std::string, std::string> > envvars_; const std::string source_repository_; - - std::string RlocationUnchecked(const std::string& path) const; }; // The "testing" namespace contains functions that allow unit testing the code. @@ -243,9 +246,7 @@ std::string runfiles_dir, std::function<bool(const std::string&)> is_runfiles_manifest, std::function<bool(const std::string&)> is_runfiles_directory, - std::function<bool(const std::string&)> is_repo_mapping, - std::string* out_manifest, std::string* out_directory, - std::string* out_repo_mapping); + std::string* out_manifest, std::string* out_directory); // For testing only. // Returns true if `path` is an absolute Unix or Windows path.
diff --git a/tools/cpp/runfiles/runfiles_test.cc b/tools/cpp/runfiles/runfiles_test.cc index 597dc23..4abb19f3 100644 --- a/tools/cpp/runfiles/runfiles_test.cc +++ b/tools/cpp/runfiles/runfiles_test.cc
@@ -498,135 +498,106 @@ EXPECT_TRUE(TestOnly_PathsFrom( "argv0", "mock1.runfiles/MANIFEST", "mock2.runfiles", [](const string& path) { return path == "mock1.runfiles/MANIFEST"; }, - [](const string& path) { return path == "mock2.runfiles"; }, - [](const string& path) { return path == "mock2.repo_mapping"; }, &mf, - &dir, &rm)); + [](const string& path) { return path == "mock2.runfiles"; }, &mf, &dir)); EXPECT_EQ(mf, "mock1.runfiles/MANIFEST"); EXPECT_EQ(dir, "mock2.runfiles"); - EXPECT_EQ(rm, "mock2.repo_mapping"); // RUNFILES_MANIFEST_FILE is invalid but RUNFILES_DIR is good and there's a // runfiles manifest in the runfiles directory. EXPECT_TRUE(TestOnly_PathsFrom( "argv0", "mock1.runfiles/MANIFEST", "mock2.runfiles", [](const string& path) { return path == "mock2.runfiles/MANIFEST"; }, - [](const string& path) { return path == "mock2.runfiles"; }, - [](const string& path) { return path == "mock2.repo_mapping"; }, &mf, - &dir, &rm)); + [](const string& path) { return path == "mock2.runfiles"; }, &mf, &dir)); EXPECT_EQ(mf, "mock2.runfiles/MANIFEST"); EXPECT_EQ(dir, "mock2.runfiles"); - EXPECT_EQ(rm, "mock2.repo_mapping"); // RUNFILES_MANIFEST_FILE is invalid but RUNFILES_DIR is good, but there's no // runfiles manifest in the runfiles directory. EXPECT_TRUE(TestOnly_PathsFrom( "argv0", "mock1.runfiles/MANIFEST", "mock2.runfiles", [](const string& path) { return false; }, - [](const string& path) { return path == "mock2.runfiles"; }, - [](const string& path) { return path == "mock2.repo_mapping"; }, &mf, - &dir, &rm)); + [](const string& path) { return path == "mock2.runfiles"; }, &mf, &dir)); EXPECT_EQ(mf, ""); EXPECT_EQ(dir, "mock2.runfiles"); - EXPECT_EQ(rm, "mock2.repo_mapping"); // RUNFILES_DIR is invalid but RUNFILES_MANIFEST_FILE is good, and it is in // a valid-looking runfiles directory. EXPECT_TRUE(TestOnly_PathsFrom( "argv0", "mock1.runfiles/MANIFEST", "mock2", [](const string& path) { return path == "mock1.runfiles/MANIFEST"; }, - [](const string& path) { return path == "mock1.runfiles"; }, - [](const string& path) { return path == "mock1.repo_mapping"; }, &mf, - &dir, &rm)); + [](const string& path) { return path == "mock1.runfiles"; }, &mf, &dir)); EXPECT_EQ(mf, "mock1.runfiles/MANIFEST"); EXPECT_EQ(dir, "mock1.runfiles"); - EXPECT_EQ(rm, "mock1.repo_mapping"); // RUNFILES_DIR is invalid but RUNFILES_MANIFEST_FILE is good, but it is not // in any valid-looking runfiles directory. EXPECT_TRUE(TestOnly_PathsFrom( "argv0", "mock1/MANIFEST", "mock2", [](const string& path) { return path == "mock1/MANIFEST"; }, - [](const string& path) { return false; }, - [](const string& path) { return true; }, &mf, &dir, &rm)); + [](const string& path) { return false; }, &mf, &dir)); EXPECT_EQ(mf, "mock1/MANIFEST"); EXPECT_EQ(dir, ""); - EXPECT_EQ(rm, ""); // Both envvars are invalid, but there's a manifest in a runfiles directory // next to argv0, however there's no other content in the runfiles directory. EXPECT_TRUE(TestOnly_PathsFrom( "argv0", "mock1/MANIFEST", "mock2", [](const string& path) { return path == "argv0.runfiles/MANIFEST"; }, - [](const string& path) { return false; }, - [](const string& path) { return path == "argv0.repo_mapping"; }, &mf, - &dir, &rm)); + [](const string& path) { return false; }, &mf, &dir)); EXPECT_EQ(mf, "argv0.runfiles/MANIFEST"); EXPECT_EQ(dir, ""); - EXPECT_EQ(rm, "argv0.repo_mapping"); // Both envvars are invalid, but there's a manifest next to argv0. There's // no runfiles tree anywhere. EXPECT_TRUE(TestOnly_PathsFrom( "argv0", "mock1/MANIFEST", "mock2", [](const string& path) { return path == "argv0.runfiles_manifest"; }, - [](const string& path) { return false; }, - [](const string& path) { return path == "argv0.repo_mapping"; }, &mf, - &dir, &rm)); + [](const string& path) { return false; }, &mf, &dir)); EXPECT_EQ(mf, "argv0.runfiles_manifest"); EXPECT_EQ(dir, ""); - EXPECT_EQ(rm, "argv0.repo_mapping"); // Both envvars are invalid, but there's a valid manifest next to argv0, and a // valid runfiles directory (without a manifest in it). EXPECT_TRUE(TestOnly_PathsFrom( "argv0", "mock1/MANIFEST", "mock2", [](const string& path) { return path == "argv0.runfiles_manifest"; }, - [](const string& path) { return path == "argv0.runfiles"; }, - [](const string& path) { return path == "argv0.repo_mapping"; }, &mf, - &dir, &rm)); + [](const string& path) { return path == "argv0.runfiles"; }, &mf, &dir)); EXPECT_EQ(mf, "argv0.runfiles_manifest"); EXPECT_EQ(dir, "argv0.runfiles"); - EXPECT_EQ(rm, "argv0.repo_mapping"); // Both envvars are invalid, but there's a valid runfiles directory next to // argv0, though no manifest in it. EXPECT_TRUE(TestOnly_PathsFrom( "argv0", "mock1/MANIFEST", "mock2", [](const string& path) { return false; }, - [](const string& path) { return path == "argv0.runfiles"; }, - [](const string& path) { return path == "argv0.repo_mapping"; }, &mf, - &dir, &rm)); + [](const string& path) { return path == "argv0.runfiles"; }, &mf, &dir)); EXPECT_EQ(mf, ""); EXPECT_EQ(dir, "argv0.runfiles"); - EXPECT_EQ(rm, "argv0.repo_mapping"); // Both envvars are invalid, but there's a valid runfiles directory next to // argv0 with a valid manifest in it. EXPECT_TRUE(TestOnly_PathsFrom( "argv0", "mock1/MANIFEST", "mock2", [](const string& path) { return path == "argv0.runfiles/MANIFEST"; }, - [](const string& path) { return path == "argv0.runfiles"; }, - [](const string& path) { return path == "argv0.repo_mapping"; }, &mf, - &dir, &rm)); + [](const string& path) { return path == "argv0.runfiles"; }, &mf, &dir)); EXPECT_EQ(mf, "argv0.runfiles/MANIFEST"); EXPECT_EQ(dir, "argv0.runfiles"); - EXPECT_EQ(rm, "argv0.repo_mapping"); } TEST_F(RunfilesTest, ManifestBasedRlocationWithRepoMapping_fromMain) { string uid = LINE_AS_STRING(); - unique_ptr<MockFile> mf(MockFile::Create( - "foo" + uid + ".runfiles_manifest", - {"config.json /etc/config.json", - "protobuf~3.19.2/foo/runfile C:/Actual Path\\protobuf\\runfile", - "_main/bar/runfile /the/path/./to/other//other runfile.txt", - "protobuf~3.19.2/bar/dir E:\\Actual Path\\Directory"})); - ASSERT_TRUE(mf != nullptr); unique_ptr<MockFile> rm(MockFile::Create( "foo" + uid + ".repo_mapping", {",my_module,_main", ",my_protobuf,protobuf~3.19.2", ",my_workspace,_main", "protobuf~3.19.2,protobuf,protobuf~3.19.2"})); ASSERT_TRUE(rm != nullptr); + unique_ptr<MockFile> mf(MockFile::Create( + "foo" + uid + ".runfiles_manifest", + {"_repo_mapping " + rm->Path(), "config.json /etc/config.json", + "protobuf~3.19.2/foo/runfile C:/Actual Path\\protobuf\\runfile", + "_main/bar/runfile /the/path/./to/other//other runfile.txt", + "protobuf~3.19.2/bar/dir E:\\Actual Path\\Directory"})); + ASSERT_TRUE(mf != nullptr); string argv0(mf->Path().substr( 0, mf->Path().size() - string(".runfiles_manifest").size())); @@ -673,18 +644,18 @@ TEST_F(RunfilesTest, ManifestBasedRlocationWithRepoMapping_fromOtherRepo) { string uid = LINE_AS_STRING(); - unique_ptr<MockFile> mf(MockFile::Create( - "foo" + uid + ".runfiles_manifest", - {"config.json /etc/config.json", - "protobuf~3.19.2/foo/runfile C:/Actual Path\\protobuf\\runfile", - "_main/bar/runfile /the/path/./to/other//other runfile.txt", - "protobuf~3.19.2/bar/dir E:\\Actual Path\\Directory"})); - ASSERT_TRUE(mf != nullptr); unique_ptr<MockFile> rm(MockFile::Create( "foo" + uid + ".repo_mapping", {",my_module,_main", ",my_protobuf,protobuf~3.19.2", ",my_workspace,_main", "protobuf~3.19.2,protobuf,protobuf~3.19.2"})); ASSERT_TRUE(rm != nullptr); + unique_ptr<MockFile> mf(MockFile::Create( + "foo" + uid + ".runfiles_manifest", + {"_repo_mapping " + rm->Path(), "config.json /etc/config.json", + "protobuf~3.19.2/foo/runfile C:/Actual Path\\protobuf\\runfile", + "_main/bar/runfile /the/path/./to/other//other runfile.txt", + "protobuf~3.19.2/bar/dir E:\\Actual Path\\Directory"})); + ASSERT_TRUE(mf != nullptr); string argv0(mf->Path().substr( 0, mf->Path().size() - string(".runfiles_manifest").size())); @@ -728,17 +699,13 @@ TEST_F(RunfilesTest, DirectoryBasedRlocationWithRepoMapping_fromMain) { string uid = LINE_AS_STRING(); - unique_ptr<MockFile> dir_marker( - MockFile::Create("foo" + uid + ".runfiles/marker"), {}); - ASSERT_TRUE(dir_marker != nullptr); - string dir = dir_marker->DirName(); unique_ptr<MockFile> rm(MockFile::Create( - "foo" + uid + ".repo_mapping", + "foo" + uid + ".runfiles/_repo_mapping", {",my_module,_main", ",my_protobuf,protobuf~3.19.2", ",my_workspace,_main", "protobuf~3.19.2,protobuf,protobuf~3.19.2"})); ASSERT_TRUE(rm != nullptr); - string argv0( - rm->Path().substr(0, rm->Path().size() - string(".repo_mapping").size())); + string dir = rm->DirName(); + string argv0(dir.substr(0, dir.size() - string(".runfiles").size())); string error; unique_ptr<Runfiles> r(Runfiles::Create(argv0, /*runfiles_manifest_file=*/"", @@ -779,17 +746,13 @@ TEST_F(RunfilesTest, DirectoryBasedRlocationWithRepoMapping_fromOtherRepo) { string uid = LINE_AS_STRING(); - unique_ptr<MockFile> dir_marker( - MockFile::Create("foo" + uid + ".runfiles/marker"), {}); - ASSERT_TRUE(dir_marker != nullptr); - string dir = dir_marker->DirName(); unique_ptr<MockFile> rm(MockFile::Create( - "foo" + uid + ".repo_mapping", + "foo" + uid + ".runfiles/_repo_mapping", {",my_module,_main", ",my_protobuf,protobuf~3.19.2", ",my_workspace,_main", "protobuf~3.19.2,protobuf,protobuf~3.19.2"})); ASSERT_TRUE(rm != nullptr); - string argv0( - rm->Path().substr(0, rm->Path().size() - string(".repo_mapping").size())); + string dir = rm->DirName(); + string argv0(dir.substr(0, dir.size() - string(".runfiles").size())); string error; unique_ptr<Runfiles> r(Runfiles::Create(argv0, /*runfiles_manifest_file=*/"", @@ -827,17 +790,13 @@ TEST_F(RunfilesTest, DirectoryBasedRlocationWithRepoMapping_fromOtherRepo_withSourceRepo) { string uid = LINE_AS_STRING(); - unique_ptr<MockFile> dir_marker( - MockFile::Create("foo" + uid + ".runfiles/marker"), {}); - ASSERT_TRUE(dir_marker != nullptr); - string dir = dir_marker->DirName(); unique_ptr<MockFile> rm(MockFile::Create( - "foo" + uid + ".repo_mapping", + "foo" + uid + ".runfiles/_repo_mapping", {",my_module,_main", ",my_protobuf,protobuf~3.19.2", ",my_workspace,_main", "protobuf~3.19.2,protobuf,protobuf~3.19.2"})); ASSERT_TRUE(rm != nullptr); - string argv0( - rm->Path().substr(0, rm->Path().size() - string(".repo_mapping").size())); + string dir = rm->DirName(); + string argv0(dir.substr(0, dir.size() - string(".runfiles").size())); string error; unique_ptr<Runfiles> r(Runfiles::Create(argv0, /*runfiles_manifest_file=*/"", @@ -875,15 +834,11 @@ TEST_F(RunfilesTest, InvalidRepoMapping) { string uid = LINE_AS_STRING(); - unique_ptr<MockFile> dir_marker( - MockFile::Create("foo" + uid + ".runfiles/marker"), {}); - ASSERT_TRUE(dir_marker != nullptr); - string dir = dir_marker->DirName(); unique_ptr<MockFile> rm( - MockFile::Create("foo" + uid + ".repo_mapping", {"a,b"})); + MockFile::Create("foo" + uid + ".runfiles/_repo_mapping", {"a,b"})); ASSERT_TRUE(rm != nullptr); - string argv0( - rm->Path().substr(0, rm->Path().size() - string(".repo_mapping").size())); + string dir = rm->DirName(); + string argv0(dir.substr(0, dir.size() - string(".runfiles").size())); string error; unique_ptr<Runfiles> r(Runfiles::Create(argv0, /*runfiles_manifest_file=*/"",