# HG changeset patch # User shade # Date 1516362531 -3600 # Node ID f14caf61406172bc2040524c30b56475f23b68d9 # Parent 267a6ce379ba0009b47d601b8a67792ab1d32e73 Disable two more tests when Epsilon is not available. diff -r 267a6ce379ba -r f14caf614061 test/hotspot/jtreg/gc/epsilon/TestMemoryMXBeans.java --- a/test/hotspot/jtreg/gc/epsilon/TestMemoryMXBeans.java Fri Jan 19 12:24:15 2018 +0100 +++ b/test/hotspot/jtreg/gc/epsilon/TestMemoryMXBeans.java Fri Jan 19 12:48:51 2018 +0100 @@ -35,11 +35,13 @@ import java.lang.management.*; import java.util.*; -public class TestMemoryMXBeans { +public class TestMemoryMXBeans extends AbstractEpsilonTest { static volatile Object sink; public static void main(String[] args) throws Exception { + if (!isEpsilonEnabled()) return; + if (args.length < 2) { throw new IllegalStateException("Should provide expected heap sizes"); } diff -r 267a6ce379ba -r f14caf614061 test/hotspot/jtreg/gc/epsilon/TestMemoryPools.java --- a/test/hotspot/jtreg/gc/epsilon/TestMemoryPools.java Fri Jan 19 12:24:15 2018 +0100 +++ b/test/hotspot/jtreg/gc/epsilon/TestMemoryPools.java Fri Jan 19 12:48:51 2018 +0100 @@ -33,9 +33,11 @@ import java.lang.management.*; import java.util.*; -public class TestMemoryPools { +public class TestMemoryPools extends AbstractEpsilonTest { public static void main(String[] args) throws Exception { + if (!isEpsilonEnabled()) return; + List mms = ManagementFactory.getMemoryManagerMXBeans(); if (mms == null) { throw new RuntimeException("getMemoryManagerMXBeans is null");