Skip to content

Commit 853b4df

Browse files
committed
[bazel] Fix runfiles loading in Bzlmod
1 parent 91b6d4e commit 853b4df

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

MODULE.bazel.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dotnet/test/common/Environment/EnvironmentManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private EnvironmentManager()
2626
try
2727
{
2828
var runfiles = Runfiles.Create();
29-
dataFilePath = runfiles.Rlocation("selenium/dotnet/test/common/appconfig.json");
29+
dataFilePath = runfiles.Rlocation("_main/dotnet/test/common/appconfig.json");
3030
}
3131
catch (FileNotFoundException)
3232
{
@@ -135,7 +135,7 @@ private EnvironmentManager()
135135
}
136136
else
137137
{
138-
projectRoot += "/selenium";
138+
projectRoot += "/_main";
139139
}
140140

141141
webServer = new TestWebServer(projectRoot, webServerConfig);

dotnet/test/common/Environment/TestWebServer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class TestWebServer
1313
{
1414
private Process webserverProcess;
1515

16-
private string standaloneTestJar = @"selenium/java/test/org/openqa/selenium/environment/appserver";
16+
private string standaloneTestJar = @"_main/java/test/org/openqa/selenium/environment/appserver";
1717
private string projectRootPath;
1818
private bool captureWebServerOutput;
1919
private bool hideCommandPrompt;

java/test/org/openqa/selenium/testing/drivers/OutOfProcessSeleniumServer.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,7 @@ private String buildServerAndClasspath() {
169169
try {
170170
Runfiles.Preloaded runfiles = Runfiles.preload();
171171
String location =
172-
runfiles
173-
.unmapped()
174-
.rlocation("selenium/java/src/org/openqa/selenium/grid/selenium_server");
172+
runfiles.unmapped().rlocation("_main/java/src/org/openqa/selenium/grid/selenium_server");
175173
System.err.println("Location found is: " + location);
176174
Path path = Paths.get(location);
177175
if (Files.exists(path)) {

0 commit comments

Comments
 (0)