From e0cd3c2693a9dcf3177eb0510af80db768ee91a6 Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Wed, 28 Jun 2017 15:34:45 +0200
Subject: [PATCH] fix tests
---
.../fastpaths/SubscriptDataFrameFastPath.java | 2 +-
.../fastpaths/SubsetDataFrameFastPath.java | 2 +-
.../truffle/r/test/ExpectedTestOutput.test | 18 ++++++++++--------
.../r/test/builtins/TestBuiltin_rowsum.java | 4 ++--
.../r/test/builtins/TestBuiltin_strrep.java | 4 ++--
5 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/fastpaths/SubscriptDataFrameFastPath.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/fastpaths/SubscriptDataFrameFastPath.java
index 44f5e7d83e..230cb8046b 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/fastpaths/SubscriptDataFrameFastPath.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/fastpaths/SubscriptDataFrameFastPath.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/fastpaths/SubsetDataFrameFastPath.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/fastpaths/SubsetDataFrameFastPath.java
index 03afb67060..a68e960b0c 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/fastpaths/SubsetDataFrameFastPath.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/fastpaths/SubsetDataFrameFastPath.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
index fcf773f2ef..9817201bb6 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
@@ -48822,13 +48822,13 @@ numeric(0)
[1] "1" "2"
##com.oracle.truffle.r.test.builtins.TestBuiltin_rowsum.testRowsumArgCoverage#
-#if (!any(R.version$engine == "FastR")) { cat("Error in rowsum_matrix(x, NULL, ug, FALSE, as.character(ug)) :\n invalid 'g' argument") } else { x <- matrix(1:10, ncol=2); g <- c(1,2,3,2,1); ug <-unique(g); .Internal(rowsum_matrix(x, NULL, ug, FALSE,as.character(ug))) }
-Error in rowsum_matrix(x, NULL, ug, FALSE, as.character(ug)) :
- invalid 'g' argument
+#if (!any(R.version$engine == "FastR")) { cat("Error: invalid 'g' argument\n") } else { x <- matrix(1:10, ncol=2); g <- c(1,2,3,2,1); ug <-unique(g); .Internal(rowsum_matrix(x, NULL, ug, FALSE,as.character(ug))) }
+Error: invalid 'g' argument
+
##com.oracle.truffle.r.test.builtins.TestBuiltin_rowsum.testRowsumArgCoverage#
-#if (!any(R.version$engine == "FastR")) { cat("Error in rowsum_matrix(x, print, ug, FALSE, as.character(ug)) :\n invalid 'g' argument") } else { x <- matrix(1:10, ncol=2); g <- c(1,2,3,2,1); ug <-unique(g); .Internal(rowsum_matrix(x, print, ug, FALSE, as.character(ug))); }
-Error in rowsum_matrix(x, print, ug, FALSE, as.character(ug)) :
- invalid 'g' argument
+#if (!any(R.version$engine == "FastR")) { cat("Error: invalid 'g' argument\n") } else { x <- matrix(1:10, ncol=2); g <- c(1,2,3,2,1); ug <-unique(g); .Internal(rowsum_matrix(x, print, ug, FALSE, as.character(ug))); }
+Error: invalid 'g' argument
+
##com.oracle.truffle.r.test.builtins.TestBuiltin_rowsum.testRowsumArgCoverage#Output.IgnoreErrorMessage#
#x <- matrix(1:10, ncol=2); g <- c(1,2,3,2,1); ug <-unique(g); .Internal(rowsum_matrix(x, , ug, FALSE,as.character(ug)))
Error in .Internal(rowsum_matrix(x, , ug, FALSE, as.character(ug))) :
@@ -65850,11 +65850,13 @@ character(0)
[5] "1894-01-01 GMT" "1895-01-01 GMT"
##com.oracle.truffle.r.test.builtins.TestBuiltin_strrep.testArgsCasts#
-#if (!any(R.version$engine == "FastR")) { cat("character(0)") } else { .Internal(strrep('aa', NULL)) }
+#if (!any(R.version$engine == "FastR")) { cat("character(0)\n") } else { .Internal(strrep('aa', NULL)) }
character(0)
+
##com.oracle.truffle.r.test.builtins.TestBuiltin_strrep.testArgsCasts#
-#if (!any(R.version$engine == "FastR")) { cat("character(0)") } else { .Internal(strrep(NULL, 5)) }
+#if (!any(R.version$engine == "FastR")) { cat("character(0)\n") } else { .Internal(strrep(NULL, 5)) }
character(0)
+
##com.oracle.truffle.r.test.builtins.TestBuiltin_strrep.testArgsCasts#
#{ .Internal(strrep('', ) }
Error: unexpected '}' in "{ .Internal(strrep('', ) }"
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rowsum.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rowsum.java
index f30f514b0a..d373ef5d1e 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rowsum.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rowsum.java
@@ -64,13 +64,13 @@ public class TestBuiltin_rowsum extends TestBase {
assertEval("x <- matrix(1:10, ncol=2); g <- c(1,2,3,2,1); ug <-unique(g); .Internal(rowsum_matrix(x, g, ug, FALSE, as.character(ug)))");
// 2nd parm function => GnuR Error: segfault
assertEvalFastR("x <- matrix(1:10, ncol=2); g <- c(1,2,3,2,1); ug <-unique(g); .Internal(rowsum_matrix(x, print, ug, FALSE, as.character(ug)));",
- "cat(\"Error in rowsum_matrix(x, print, ug, FALSE, as.character(ug)) :\\n invalid 'g' argument\")");
+ "cat(\"Error: invalid 'g' argument\\n\")");
// 3rd parm is function => GnuR Error: "Error: unimplemented type 'closure' in
// 'HashTableSetup'"
assertEval(Output.IgnoreErrorMessage, "x <- matrix(1:10, ncol=2); g <- c(1,2,3,2,1); ug <-unique(g); .Internal(rowsum_matrix(x, g, print, FALSE, as.character(ug)))");
// 2nd parm NULL => GnuR Error: segfault\n" +
assertEvalFastR("x <- matrix(1:10, ncol=2); g <- c(1,2,3,2,1); ug <-unique(g); .Internal(rowsum_matrix(x, NULL, ug, FALSE,as.character(ug)))",
- "cat(\"Error in rowsum_matrix(x, NULL, ug, FALSE, as.character(ug)) :\\n invalid 'g' argument\")");
+ "cat(\"Error: invalid 'g' argument\\n\")");
// 3rd parm NULL => GnuR Error: Error: unimplemented type 'NULL' in 'HashTableSetup'
assertEval(Output.IgnoreErrorMessage, "x <- matrix(1:10, ncol=2); g <- c(1,2,3,2,1); ug <-unique(g); .Internal(rowsum_matrix(x, g, NULL, FALSE,as.character(ug)))");
assertEval(Output.IgnoreErrorMessage, "x <- matrix(1:10, ncol=2); g <- c(1,2,3,2,1); ug <-unique(g); .Internal(rowsum_matrix(x, , ug, FALSE,as.character(ug)))");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_strrep.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_strrep.java
index 57bfc3df70..5b2ceaa08e 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_strrep.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_strrep.java
@@ -38,9 +38,9 @@ public class TestBuiltin_strrep extends TestBase {
@Test
public void testArgsCasts() {
// GnuR fails with segfault
- assertEvalFastR(".Internal(strrep(NULL, 5))", "cat(\"character(0)\")");
+ assertEvalFastR(".Internal(strrep(NULL, 5))", "cat(\"character(0)\\n\")");
// GnuR - infinite loop
- assertEvalFastR(".Internal(strrep('aa', NULL))", "cat(\"character(0)\")");
+ assertEvalFastR(".Internal(strrep('aa', NULL))", "cat(\"character(0)\\n\")");
assertEval("{ .Internal(strrep(, '') }");
assertEval("{ .Internal(strrep('', ) }");
}
--
GitLab