From 6b58d659d0b3af75ecd7ea9f00ae9b74460e6da2 Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Fri, 5 Feb 2016 13:16:33 +0100
Subject: [PATCH] enable passing tests
---
.../oracle/truffle/r/test/builtins/TestBuiltin_Conj.java | 6 +++---
.../truffle/r/test/builtins/TestBuiltin_allnames.java | 5 ++---
.../oracle/truffle/r/test/builtins/TestBuiltin_allvars.java | 4 ++--
.../oracle/truffle/r/test/builtins/TestBuiltin_body.java | 4 ++--
.../com/oracle/truffle/r/test/builtins/TestBuiltin_rep.java | 6 +++---
.../truffle/r/test/library/base/TestEnvironments.java | 2 +-
6 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_Conj.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_Conj.java
index 3f25f6fa70..180e2e69b1 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_Conj.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_Conj.java
@@ -19,7 +19,7 @@ public class TestBuiltin_Conj extends TestBase {
@Test
public void testConj1() {
- assertEval(Ignored.Unknown, "argv <- list(NA_complex_);Conj(argv[[1]]);");
+ assertEval("argv <- list(NA_complex_);Conj(argv[[1]]);");
}
@Test
@@ -42,12 +42,12 @@ public class TestBuiltin_Conj extends TestBase {
@Test
public void testConj5() {
- assertEval(Ignored.Unknown, "argv <- list(structure(numeric(0), .Dim = c(0L, 0L)));Conj(argv[[1]]);");
+ assertEval("argv <- list(structure(numeric(0), .Dim = c(0L, 0L)));Conj(argv[[1]]);");
}
@Test
public void testConj6() {
- assertEval(Ignored.Unknown, "argv <- list(FALSE);Conj(argv[[1]]);");
+ assertEval("argv <- list(FALSE);Conj(argv[[1]]);");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_allnames.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_allnames.java
index 1597e585cd..9d56dfcfb7 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_allnames.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_allnames.java
@@ -4,7 +4,7 @@
* http://www.gnu.org/licenses/gpl-2.0.html
*
* Copyright (c) 2014, Purdue University
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates
*
* All rights reserved.
*/
@@ -19,8 +19,7 @@ public class TestBuiltin_allnames extends TestBase {
@Test
public void testallnames1() {
- assertEval(Ignored.MissingBuiltin,
- "argv <- list(quote(y ~ ((g1) * exp((log(g2/g1)) * (1 - exp(-k * (x - Ta)))/(1 - exp(-k * (Tb - Ta)))))), FALSE, -1L, TRUE); .Internal(all.names(argv[[1]], argv[[2]], argv[[3]], argv[[4]]))");
+ assertEval("argv <- list(quote(y ~ ((g1) * exp((log(g2/g1)) * (1 - exp(-k * (x - Ta)))/(1 - exp(-k * (Tb - Ta)))))), FALSE, -1L, TRUE); .Internal(all.names(argv[[1]], argv[[2]], argv[[3]], argv[[4]]))");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_allvars.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_allvars.java
index 7707fe0503..301ca50d3b 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_allvars.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_allvars.java
@@ -4,7 +4,7 @@
* http://www.gnu.org/licenses/gpl-2.0.html
*
* Copyright (c) 2014, Purdue University
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates
*
* All rights reserved.
*/
@@ -20,7 +20,7 @@ public class TestBuiltin_allvars extends TestBase {
@Test
public void testallvars1() {
- assertEval(Ignored.Unknown, "argv <- structure(list(expr = expression(quote(temp[1, ] ~ 3))), .Names = 'expr');do.call('all.vars', argv)");
+ assertEval("argv <- structure(list(expr = expression(quote(temp[1, ] ~ 3))), .Names = 'expr');do.call('all.vars', argv)");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_body.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_body.java
index a955fa4825..5a19fd32f3 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_body.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_body.java
@@ -4,7 +4,7 @@
* http://www.gnu.org/licenses/gpl-2.0.html
*
* Copyright (c) 2014, Purdue University
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates
*
* All rights reserved.
*/
@@ -19,7 +19,7 @@ public class TestBuiltin_body extends TestBase {
@Test
public void testbody1() {
- assertEval(Ignored.Unknown, "argv <- list(function (x, y) { c(x, y)}); .Internal(body(argv[[1]]))");
+ assertEval("argv <- list(function (x, y) { c(x, y)}); .Internal(body(argv[[1]]))");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rep.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rep.java
index e647cd3c9b..e6c8dc7133 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rep.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rep.java
@@ -4,7 +4,7 @@
* http://www.gnu.org/licenses/gpl-2.0.html
*
* Copyright (c) 2012-2014, Purdue University
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates
*
* All rights reserved.
*/
@@ -34,7 +34,7 @@ public class TestBuiltin_rep extends TestBase {
@Test
public void testrep4() {
- assertEval(Ignored.Unknown, "argv <- list(list(), 0L); .Internal(rep_len(argv[[1]], argv[[2]]))");
+ assertEval("argv <- list(list(), 0L); .Internal(rep_len(argv[[1]], argv[[2]]))");
}
@Test
@@ -54,7 +54,7 @@ public class TestBuiltin_rep extends TestBase {
@Test
public void testrep8() {
- assertEval(Ignored.Unknown, "argv <- list(list(c(' ', ' ')), 1L); .Internal(rep_len(argv[[1]], argv[[2]]))");
+ assertEval("argv <- list(list(c(' ', ' ')), 1L); .Internal(rep_len(argv[[1]], argv[[2]]))");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestEnvironments.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestEnvironments.java
index ab576942ab..0967a9610d 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestEnvironments.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestEnvironments.java
@@ -264,7 +264,7 @@ public class TestEnvironments extends TestBase {
assertEval("{ ph <- new.env() ; h <- new.env(parent=ph) ; assign(\"x\", 10, h, inherits=TRUE) ; x }");
// Requires generic specialization
- assertEval(Ignored.Unknown, Output.ContainsError, "{ as.environment(as.environment) }");
+ assertEval("{ as.environment(as.environment) }");
}
@Test
--
GitLab