Mercurial > hg > graal-jvmci-8
changeset 4416:be787de79394
Fail bench/test on "Exception occured in scope: "
Bailout exception should be ignored
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Mon, 30 Jan 2012 16:14:55 +0100 |
parents | 63024a82e165 |
children | 648a7873cea2 |
files | graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/HotSpotDebugConfig.java mx/sanitycheck.py |
diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/HotSpotDebugConfig.java Mon Jan 30 15:46:58 2012 +0100 +++ b/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/HotSpotDebugConfig.java Mon Jan 30 16:14:55 2012 +0100 @@ -25,6 +25,7 @@ import java.util.*; import java.util.regex.*; +import com.oracle.max.cri.ci.*; import com.oracle.max.cri.ri.*; import com.oracle.max.graal.compiler.*; import com.oracle.max.graal.debug.*; @@ -121,7 +122,11 @@ @Override public RuntimeException interceptException(RuntimeException e) { + if (e instanceof CiBailout) { + return e; + } Debug.setConfig(Debug.fixedConfig(true, true, false, false)); + // sync "Exception occured in scope: " with mx/sanitycheck.py::Test.__init__ Debug.log(String.format("Exception occured in scope: %s", Debug.currentScope())); for (Object o : Debug.context()) { Debug.log("Context obj %s", o);
--- a/mx/sanitycheck.py Mon Jan 30 15:46:58 2012 +0100 +++ b/mx/sanitycheck.py Mon Jan 30 16:14:55 2012 +0100 @@ -134,7 +134,7 @@ self.name = name self.group = group self.successREs = successREs - self.failureREs = failureREs + self.failureREs = failureREs + [re.compile(r"Exception occured in scope: ")] self.scoreMatchers = scoreMatchers self.vmOpts = vmOpts self.cmd = cmd