From b056e1d3c07fad89fe5008fda756b4ed2ff5e4ed Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Fri, 3 Mar 2017 14:41:56 -0800
Subject: [PATCH] Revert tests4 after [GR-3100]
---
.../packages/tests4/tests4/tests/methods1.R | 3 +--
.../packages/tests4/tests4/tests/methods2.R | 3 +--
.../packages/tests4/tests4/tests/methods4.R | 3 +--
.../packages/tests4/tests4/tests/methods5.R | 3 +--
mx.fastr/mx_fastr.py | 2 +-
5 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/com.oracle.truffle.r.test.native/packages/tests4/tests4/tests/methods1.R b/com.oracle.truffle.r.test.native/packages/tests4/tests4/tests/methods1.R
index 1a1b75d9c5..35c6b67058 100644
--- a/com.oracle.truffle.r.test.native/packages/tests4/tests4/tests/methods1.R
+++ b/com.oracle.truffle.r.test.native/packages/tests4/tests4/tests/methods1.R
@@ -21,6 +21,5 @@ setMethod("sides", signature("Square"), function(object) 4)
# setMethod("sides", signature("Circle"), function(object) Inf)
res<-print(showMethods("sides"))
-# BUG ALERT:In FastR without the "print" the result from removeGeneric (TRUE) is not printed.
-print(removeGeneric("sides"))
+removeGeneric("sides")
print(res)
diff --git a/com.oracle.truffle.r.test.native/packages/tests4/tests4/tests/methods2.R b/com.oracle.truffle.r.test.native/packages/tests4/tests4/tests/methods2.R
index 9fdf38279f..375a0a9b87 100644
--- a/com.oracle.truffle.r.test.native/packages/tests4/tests4/tests/methods2.R
+++ b/com.oracle.truffle.r.test.native/packages/tests4/tests4/tests/methods2.R
@@ -21,6 +21,5 @@ setMethod("sides", signature("Square"), function(object) 4)
setMethod("sides", signature("Circle"), function(object) Inf)
res<-print(showMethods(class = "Polygon"))
-# BUG print should not be necessary
-print(removeGeneric("sides"))
+removeGeneric("sides")
print(res)
diff --git a/com.oracle.truffle.r.test.native/packages/tests4/tests4/tests/methods4.R b/com.oracle.truffle.r.test.native/packages/tests4/tests4/tests/methods4.R
index 6f75874a4a..b9df6ef17f 100644
--- a/com.oracle.truffle.r.test.native/packages/tests4/tests4/tests/methods4.R
+++ b/com.oracle.truffle.r.test.native/packages/tests4/tests4/tests/methods4.R
@@ -12,6 +12,5 @@ setMethod("foo", signature("A1", "A2"), function(a, b) "1-2")
setMethod("foo", signature("A2", "A1"), function(a, b) "2-1")
res<-print(foo(new("A2"), new("A2")))
-# BUG print shoukld not be necessary
-print(removeGeneric("foo"))
+removeGeneric("foo")
print(res)
diff --git a/com.oracle.truffle.r.test.native/packages/tests4/tests4/tests/methods5.R b/com.oracle.truffle.r.test.native/packages/tests4/tests4/tests/methods5.R
index e8e93ff718..e51df55343 100644
--- a/com.oracle.truffle.r.test.native/packages/tests4/tests4/tests/methods5.R
+++ b/com.oracle.truffle.r.test.native/packages/tests4/tests4/tests/methods5.R
@@ -28,5 +28,4 @@ setMethod("inspect.vehicle",
})
inspect.vehicle(new("Car"), new("Inspector"))
-# BUG print should not be necessary
-print(removeGeneric("inspect.vehicle"))
+removeGeneric("inspect.vehicle")
diff --git a/mx.fastr/mx_fastr.py b/mx.fastr/mx_fastr.py
index 4555be425a..b61e314d5c 100644
--- a/mx.fastr/mx_fastr.py
+++ b/mx.fastr/mx_fastr.py
@@ -404,7 +404,7 @@ def _test_subpackage(name):
return '.'.join((_test_package(), name))
def _simple_generated_unit_tests():
- return ','.join(map(_test_subpackage, ['engine.shell', 'library.base', 'library.grid', 'library.methods', 'library.stats', 'library.utils', 'library.fastr', 'builtins', 'functions', 'parser', 'S4', 'rng', 'runtime.data']))
+ return ','.join(map(_test_subpackage, ['engine.shell', 'library.base', 'library.grid', 'library.methods', 'library.stats', 'library.utils', 'library.fastr', 'builtins', 'functions', 'parser', 'rng', 'runtime.data']))
def _simple_unit_tests():
return ','.join([_simple_generated_unit_tests(), _test_subpackage('tck')])
--
GitLab