summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaszlo Csomor <laszlocsomor@google.com>2018-03-08 04:27:11 -0800
committerIvan Gavrilovic <gavra@google.com>2018-05-04 10:39:43 +0100
commit4c2556fe7673b48678009f74385a0ec8fe94b4ca (patch)
treec85fbb4d3dc1c52703c13d6321c5f0d886ad4279
parent1c433fd1116c4ca655503e7cffa13679c31f0b99 (diff)
downloaddesugar-4c2556fe7673b48678009f74385a0ec8fe94b4ca.tar.gz
tests,windows: enable android.desugar.runtime
Add the c.g.d.build.android.desugar.runtime tests to the transitive closure of //src:all_windows_tests, thus running them on CI. See https://github.com/bazelbuild/bazel/issues/4292 Closes #4796. PiperOrigin-RevId: 188312286 GitOrigin-RevId: 63f6e2293fe8e679732d3d180afc0e781ae40241 Change-Id: I0975c9291a5a043d562242e65e6ad5557b958d36
-rw-r--r--test/java/com/google/devtools/build/android/desugar/runtime/ThrowableExtensionTestUtility.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/test/java/com/google/devtools/build/android/desugar/runtime/ThrowableExtensionTestUtility.java b/test/java/com/google/devtools/build/android/desugar/runtime/ThrowableExtensionTestUtility.java
index b65b8bd..489bd7a 100644
--- a/test/java/com/google/devtools/build/android/desugar/runtime/ThrowableExtensionTestUtility.java
+++ b/test/java/com/google/devtools/build/android/desugar/runtime/ThrowableExtensionTestUtility.java
@@ -27,7 +27,7 @@ public class ThrowableExtensionTestUtility {
private static final String SYSTEM_PROPERTY_EXPECTED_STRATEGY = "expected.strategy";
public static String getTwrStrategyClassNameSpecifiedInSystemProperty() {
- String className = System.getProperty(SYSTEM_PROPERTY_EXPECTED_STRATEGY);
+ String className = unquote(System.getProperty(SYSTEM_PROPERTY_EXPECTED_STRATEGY));
assertThat(className).isNotEmpty();
return className;
}
@@ -61,4 +61,13 @@ public class ThrowableExtensionTestUtility {
public static boolean isReuseStrategy() {
return isStrategyOfClass(THROWABLE_EXTENSION_CLASS_NAME + "$ReuseDesugaringStrategy");
}
+
+ private static String unquote(String s) {
+ if (s.startsWith("'") || s.startsWith("\"")) {
+ assertThat(s).endsWith(s.substring(0, 1));
+ return s.substring(1, s.length() - 1);
+ } else {
+ return s;
+ }
+ }
}