From 28f939800ff8cb89e800af248e83f2b3c1065004 Mon Sep 17 00:00:00 2001
From: Tomas Stupka <tomas.stupka@oracle.com>
Date: Tue, 24 Jul 2018 11:53:28 +0200
Subject: [PATCH] make FastRDebugTest part of rutsimple again
---
.../src/com/oracle/truffle/r/test/tck/FastRDebugTest.java | 3 ---
mx.fastr/mx_fastr.py | 4 +++-
2 files changed, 3 insertions(+), 4 deletions(-)
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 bb90ffbf43..0be73254c6 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 c8cac58a4d..beb02cb20e 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']
--
GitLab