diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRDebugTest.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRDebugTest.java index bb90ffbf43b6af20acf459752a595e0736a4b372..0be73254c66b00e28cc45419f5978ef190f8f71e 100644 --- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRDebugTest.java +++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRDebugTest.java @@ -164,9 +164,6 @@ public class FastRDebugTest { assertEquals("Factorial computed OK", 2, i); } - /** - * Test is currently ignored because of missing functionality in Truffle. - */ @Test public void testConditionalBreakpoint() throws Throwable { final Source source = sourceFromText("main <- function() { res <- 0;\n" + diff --git a/mx.fastr/mx_fastr.py b/mx.fastr/mx_fastr.py index c8cac58a4d60a62365b206c387e1f056187a33cb..beb02cb20ea00d8ec8d0213f9d9ba101dc483d1f 100644 --- a/mx.fastr/mx_fastr.py +++ b/mx.fastr/mx_fastr.py @@ -337,7 +337,9 @@ def _simple_generated_unit_tests(): return map(_test_subpackage, ['engine.shell', 'engine.interop', 'library.base', 'library.grid', 'library.fastrGrid', 'library.methods', 'library.stats', 'library.tools', 'library.utils', 'library.fastr', 'builtins', 'functions', 'parser', 'rffi', 'rng', 'runtime.data', 'S4']) def _simple_unit_tests(): - return _simple_generated_unit_tests() + ['com.oracle.truffle.r.nodes.castsTests', 'com.oracle.truffle.tck.tests'] + # com.oracle.truffle.tck.tests - truffle language inter-operability tck in com.oracle.truffle.r.test.tck/ + # com.oracle.truffle.r.test.tck - other tck tests in com.oracle.truffle.r.test/ e.g. FastRDebugTest + return _simple_generated_unit_tests() + ['com.oracle.truffle.r.nodes.castsTests', 'com.oracle.truffle.tck.tests', 'com.oracle.truffle.r.test.tck'] def _nodes_unit_tests(): return ['com.oracle.truffle.r.nodes.test', 'com.oracle.truffle.r.nodes.access.vector']