| commit | 659a1445fbce8135ab96a16a8fae1a93ca4655e5 | [log] [tgz] |
|---|---|---|
| author | Morten Krogh-Jespersen <mkroghj@google.com> | Wed Sep 13 17:03:18 2023 +0200 |
| committer | Morten Krogh-Jespersen <mkroghj@google.com> | Wed Sep 13 17:03:18 2023 +0200 |
| tree | 565d5925e613e4898cbb892f5409d93a9b8e1b7f | |
| parent | 96e4c42d693e55f9aa959b97cb60e1c00a79070e [diff] |
Check for no path given by gradle in compiler api tests Change-Id: Ib924160b37a393fc5da84a4e5caa9ee1b5a48beb
diff --git a/src/test/java/com/android/tools/r8/compilerapi/CompilerApiTest.java b/src/test/java/com/android/tools/r8/compilerapi/CompilerApiTest.java index fa79234..9441ae2 100644 --- a/src/test/java/com/android/tools/r8/compilerapi/CompilerApiTest.java +++ b/src/test/java/com/android/tools/r8/compilerapi/CompilerApiTest.java
@@ -107,13 +107,14 @@ "-keep class " + clazz.getName() + " { public static void main(java.lang.String[]); }"); } - public boolean isNewGradleSetup() { - return "true".equals(System.getProperty("USE_NEW_GRADLE_SETUP")); - } - public Path getPathForClass(Class<?> clazz) { String file = clazz.getName().replace('.', '/') + ".class"; - return Paths.get(System.getProperty("TEST_DATA_LOCATION"), file); + if (System.getProperty("TEST_DATA_LOCATION") != null) { + return Paths.get(System.getProperty("TEST_DATA_LOCATION"), file); + } else { + assert System.getProperty("USE_NEW_GRADLE_SETUP") == null; + return Paths.get("build", "classes", "java", "test", file); + } } public byte[] getBytesForClass(Class<?> clazz) throws IOException {
diff --git a/third_party/binary_compatibility_tests/compiler_api_tests.tar.gz.sha1 b/third_party/binary_compatibility_tests/compiler_api_tests.tar.gz.sha1 index 8ba6033..945fcd2 100644 --- a/third_party/binary_compatibility_tests/compiler_api_tests.tar.gz.sha1 +++ b/third_party/binary_compatibility_tests/compiler_api_tests.tar.gz.sha1
@@ -1 +1 @@ -8ec801e8e648e826987a87ee6129ab7c61e55679 \ No newline at end of file +8e1c917cd240fa40798ffa0f2175bc9373310f32 \ No newline at end of file
diff --git a/third_party/retrace/binary_compatibility.tar.gz.sha1 b/third_party/retrace/binary_compatibility.tar.gz.sha1 index 41a5e04..f1b451d 100644 --- a/third_party/retrace/binary_compatibility.tar.gz.sha1 +++ b/third_party/retrace/binary_compatibility.tar.gz.sha1
@@ -1 +1 @@ -c200df1f5305635d3b26f948a15732af5fefcacf \ No newline at end of file +cce7a600b543fcbe53dfeb84e834d389ec9c5421 \ No newline at end of file