Mercurial > hg > truffle
changeset 13748:4f095e2930c6
Merge.
author | Chris Seaton <chris.seaton@oracle.com> |
---|---|
date | Fri, 24 Jan 2014 00:44:12 +0000 |
parents | 6f9ce155dcfa (diff) bfd61161d752 (current diff) |
children | 962f06a1a387 |
files | |
diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.truffle.ruby.runtime/src/com/oracle/truffle/ruby/runtime/configuration/ConfigurationBuilder.java Fri Jan 24 00:52:06 2014 +0100 +++ b/graal/com.oracle.truffle.ruby.runtime/src/com/oracle/truffle/ruby/runtime/configuration/ConfigurationBuilder.java Fri Jan 24 00:44:12 2014 +0000 @@ -25,7 +25,7 @@ private String standardLibrary = JRUBY_STDLIB_JAR; - private boolean debug = false; + private boolean debug = true; private boolean verbose = false; private int warningLevel = 0; private int taintCheckLevel = 0; @@ -33,7 +33,7 @@ private String defaultExternalEncoding = null; private String defaultInternalEncoding = null; - private boolean trace = false; + private boolean trace = true; private boolean fullObjectSpace = false; private boolean printParseTree = false;
--- a/graal/com.oracle.truffle.ruby.test/specs/rubytruffle Fri Jan 24 00:52:06 2014 +0100 +++ b/graal/com.oracle.truffle.ruby.test/specs/rubytruffle Fri Jan 24 00:44:12 2014 +0000 @@ -9,12 +9,12 @@ # the command below - the -v flag gives you the Java command, then just append # "$@". # -# $TRUFFLE_DIR/mxtool/mx -v --vm server-nograal ruby -ea -- --home $TRUFFLE_DIR "$@" +# $GRAAL_DIR/mxtool/mx -v --vm server-nograal ruby -ea -- --home $GRAAL_DIR "$@" -TRUFFLE_DIR=../../.. +GRAAL_DIR=../../.. -$TRUFFLE_DIR/jdk1.7.0_45/product/bin/java \ +$GRAAL_DIR/jdk1.7.0_45/product/bin/java \ -server-nograal -d64 -ea \ - -cp $TRUFFLE_DIR/lib/jline-2.10.jar:$TRUFFLE_DIR/lib/jrubyparser-0.5.0.jar:$TRUFFLE_DIR/lib/jruby-stdlib-1.7.4.jar:$TRUFFLE_DIR/lib/jnr-posix-3.0.0.jar:$TRUFFLE_DIR/lib/jnr-constants-0.8.4.jar:$TRUFFLE_DIR/lib/jnr-ffi-1.0.4.jar:$TRUFFLE_DIR/lib/jffi-1.2.1.jar:$TRUFFLE_DIR/lib/jffi-1.2.1-native.jar:$TRUFFLE_DIR/lib/jnr-x86asm-1.0.2.jar:$TRUFFLE_DIR/lib/asm-4.0.jar:$TRUFFLE_DIR/lib/asm-analysis-4.0.jar:$TRUFFLE_DIR/lib/asm-commons-4.0.jar:$TRUFFLE_DIR/lib/asm-tree-4.0.jar:$TRUFFLE_DIR/lib/asm-util-4.0.jar:$TRUFFLE_DIR/graal/com.oracle.truffle.api/bin:$TRUFFLE_DIR/graal/com.oracle.truffle.ruby.runtime/bin:$TRUFFLE_DIR/graal/com.oracle.truffle.api.dsl/bin:$TRUFFLE_DIR/graal/com.oracle.truffle.ruby.nodes/bin:$TRUFFLE_DIR/graal/com.oracle.truffle.ruby.parser/bin:$TRUFFLE_DIR/graal/com.oracle.truffle.ruby.shell/bin \ + -cp $GRAAL_DIR/lib/jline-2.10.jar:$GRAAL_DIR/lib/jrubyparser-0.5.0.jar:$GRAAL_DIR/lib/jruby-stdlib-1.7.4.jar:$GRAAL_DIR/lib/jnr-posix-3.0.0.jar:$GRAAL_DIR/lib/jnr-constants-0.8.4.jar:$GRAAL_DIR/lib/jnr-ffi-1.0.4.jar:$GRAAL_DIR/lib/jffi-1.2.1.jar:$GRAAL_DIR/lib/jffi-1.2.1-native.jar:$GRAAL_DIR/lib/jnr-x86asm-1.0.2.jar:$GRAAL_DIR/lib/asm-4.0.jar:$GRAAL_DIR/lib/asm-analysis-4.0.jar:$GRAAL_DIR/lib/asm-commons-4.0.jar:$GRAAL_DIR/lib/asm-tree-4.0.jar:$GRAAL_DIR/lib/asm-util-4.0.jar:$GRAAL_DIR/graal/com.oracle.truffle.api/bin:$GRAAL_DIR/graal/com.oracle.truffle.ruby.runtime/bin:$GRAAL_DIR/graal/com.oracle.truffle.api.dsl/bin:$GRAAL_DIR/graal/com.oracle.truffle.ruby.nodes/bin:$GRAAL_DIR/graal/com.oracle.truffle.ruby.parser/bin:$GRAAL_DIR/graal/com.oracle.truffle.ruby.shell/bin \ com.oracle.truffle.ruby.shell.Shell \ - --home $TRUFFLE_DIR "$@" + --home $GRAAL_DIR "$@"