diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRTckTest.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRTckTest.java index 363accb8c931dbb8a2654bd0d5687037f1fa666b..9f678bd062deab3beefb347f76e9a49da118ee7d 100644 --- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRTckTest.java +++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRTckTest.java @@ -29,7 +29,7 @@ import org.junit.Test; import com.oracle.truffle.api.source.Source; import com.oracle.truffle.api.vm.PolyglotEngine; import com.oracle.truffle.api.vm.PolyglotEngine.Builder; -import com.oracle.truffle.r.runtime.RSource; +import com.oracle.truffle.r.runtime.RRuntime; import com.oracle.truffle.tck.TruffleTCK; public class FastRTckTest extends TruffleTCK { @@ -40,7 +40,7 @@ public class FastRTckTest extends TruffleTCK { } // @formatter:off - private static final Source INITIALIZATION = RSource.fromTextInternal( + private static final String INITIALIZATION_CODE = "fourtyTwo <- function() {\n" + " 42L\n" + "}\n" + @@ -148,11 +148,11 @@ public class FastRTckTest extends TruffleTCK { "builtinFunctionType <- function() 'builtin'\n" + "valueWithSource <- function() intValue\n" + "objectWithKeyInfoAttributes <- function() { list(rw=1, invocable=function(){ 'invoked' }) }\n" + - "for (name in ls()) export(name, get(name))\n", - RSource.Internal.TCK_INIT - ); + "for (name in ls()) export(name, get(name))\n"; // @formatter:on + private static final Source INITIALIZATION = Source.newBuilder(INITIALIZATION_CODE).name("TCK").mimeType(RRuntime.R_APP_MIME).build(); + @Override protected PolyglotEngine prepareVM(Builder builder) throws Exception { PolyglotEngine engine = builder.build();