# HG changeset patch # User Roland Schatz # Date 1423570111 -3600 # Node ID fb1ee63d5b7be2f74ab6615eab6936f0d9e96ec7 # Parent 0678ce28de6956976898813eb6c14f1d6431ba2e Pick up changes to suites when overriding options in unit tests. diff -r 0678ce28de69 -r fb1ee63d5b7b graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java --- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Tue Feb 10 10:36:19 2015 +0100 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Tue Feb 10 13:08:31 2015 +0100 @@ -55,6 +55,7 @@ import com.oracle.graal.nodes.cfg.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.options.*; import com.oracle.graal.phases.*; import com.oracle.graal.phases.common.*; import com.oracle.graal.phases.schedule.*; @@ -87,7 +88,7 @@ private final Providers providers; private final Backend backend; - private final Suites suites; + private final DerivedOptionValue suites; /** * Can be overridden by unit tests to verify properties of the graph. @@ -166,7 +167,7 @@ public GraalCompilerTest() { this.backend = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend(); this.providers = getBackend().getProviders(); - this.suites = createSuites(); + this.suites = new DerivedOptionValue<>(this::createSuites); installSubstitutions(); } @@ -186,7 +187,7 @@ this.backend = runtime.getHostBackend(); } this.providers = backend.getProviders(); - this.suites = createSuites(); + this.suites = new DerivedOptionValue<>(this::createSuites); installSubstitutions(); } @@ -351,7 +352,7 @@ } protected Suites getSuites() { - return suites; + return suites.getValue(); } protected Providers getProviders() {