Fix a few tests when run under JDK9.

RELNOTES: None
PiperOrigin-RevId: 198565423

2 files changed, 11 insertions, 3 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/select/RawAttributeMapperTest.java b/src/test/java/com/google/devtools/build/lib/analysis/select/RawAttributeMapperTest.java
index f1bf25497d..e1d3045fc3 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/select/RawAttributeMapperTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/select/RawAttributeMapperTest.java
@@ -69,7 +69,7 @@ public class RawAttributeMapperTest extends AbstractAttributeMapperTest {
       assertThat(e)
           .hasCauseThat()
           .hasMessageThat()
-          .contains("SelectorList cannot be cast to java.util.List");
+          .containsMatch(".*SelectorList cannot be cast to .*java\\.util\\.List");
     }
   }
 
@@ -107,7 +107,7 @@ public class RawAttributeMapperTest extends AbstractAttributeMapperTest {
       assertThat(e)
           .hasCauseThat()
           .hasMessageThat()
-          .contains("SelectorList cannot be cast to java.util.List");
+          .containsMatch(".*SelectorList cannot be cast to .*java\\.util\\.List");
     }
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/MoreAsserts.java b/src/test/java/com/google/devtools/build/lib/testutil/MoreAsserts.java
index 85b3b7934d..990a4177bb 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/MoreAsserts.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/MoreAsserts.java
@@ -117,7 +117,15 @@ public class MoreAsserts {
               continue;
             }
 
-            f.setAccessible(true);
+            try {
+              f.setAccessible(true);
+            } catch (RuntimeException e) {
+              // JDK9 can throw InaccessibleObjectException when internal modules are accessed.
+              // This isn't available in JDK8, so catch RuntimeException
+              // We can use a JVM arg --add_opens to suppress that, but that involves every
+              // test adding every JVM module to the target.
+              continue;
+            }
             try {
               Object ref = f.get(current);
               if (ref != null) {