Mercurial > hg > truffle

changeset 19195:fb1ee63d5b7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pick up changes to suites when overriding options in unit tests.
author Roland Schatz <roland.schatz@oracle.com>
date Tue, 10 Feb 2015 13:08:31 +0100
parents 0678ce28de69
children 75cf0899be47
files graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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> 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() {