AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Detect Windows vs Non-Windows execution context in tests. (#8767)

Browse Source
This commit is contained in:
Derek Perez 2021-06-25 12:55:11 -07:00 committed by GitHub
parent 318a48ac25
commit 9276968326
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
java/core/src/test/java/com/google/protobuf/TestUtil.java
View File

@ -3770,9 +3770,18 @@ public final class TestUtil {
} catch (IOException e) {
throw new RuntimeException("Couldn't get canonical name of working directory.", e);
}
String srcRootCheck = "src/google/protobuf";
// If we're running w/ Bazel on Windows, we're not in a sandbox, so we
// we must change our source root check condition to find the true test data dir.
String testBinaryName = System.getenv("TEST_BINARY");
if (testBinaryName != null && testBinaryName.endsWith(".exe")) {
srcRootCheck = srcRootCheck + "/descriptor.cc";
}
while (ancestor != null && ancestor.exists()) {
// Identify the true source root.
if (new File(ancestor, "src/google/protobuf/descriptor.cc").exists()) {
if (new File(ancestor, srcRootCheck).exists()) {
return new File(ancestor, "src/google/protobuf/testdata");
}
ancestor = ancestor.getParentFile();