From ac6f39df0b10ed8246c81722400a8d4b17efc092 Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Thu, 22 Mar 2018 10:10:49 +0100
Subject: [PATCH] fix expected output and CALLDEF for embedding test
---
.../embedded/src/embedded.c | 2 +-
.../embedded/src/embedded.expected.output | 31 +++----------------
2 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/com.oracle.truffle.r.test.native/embedded/src/embedded.c b/com.oracle.truffle.r.test.native/embedded/src/embedded.c
index 84d129e2e6..82c52bc4b3 100644
--- a/com.oracle.truffle.r.test.native/embedded/src/embedded.c
+++ b/com.oracle.truffle.r.test.native/embedded/src/embedded.c
@@ -188,7 +188,7 @@ int main(int argc, char **argv) {
printf("Calling R_getEmbeddingDllInfo...\n");
DllInfo *eDllInfo = R_getEmbeddingDllInfo();
R_CallMethodDef CallEntries[] = {
- CALLDEF(twice, 2),
+ CALLDEF(twice, 1),
{NULL, NULL, 0}
};
R_registerRoutines(eDllInfo, NULL, CallEntries, NULL, NULL);
diff --git a/com.oracle.truffle.r.test.native/embedded/src/embedded.expected.output b/com.oracle.truffle.r.test.native/embedded/src/embedded.expected.output
index 4a76493713..298ea4e37b 100644
--- a/com.oracle.truffle.r.test.native/embedded/src/embedded.expected.output
+++ b/com.oracle.truffle.r.test.native/embedded/src/embedded.expected.output
@@ -13,24 +13,12 @@ Caught an error calling sqrt(). Try again with a different argument.
Sourcing 'foo.R'...
Calling foo with named arguments...
Printing the expression to be eval'ed...
-[[1]]
-function(...)
-{
+function (...) {
args <- list(...)
print(args)
print(names(args))
TRUE
-}
-
-$pch
-[1] "+"
-
-$id
-[1] 123
-
-[[4]]
-[1] TRUE FALSE
-
+}(pch = "+", id = 123L, c(TRUE, FALSE))
Eval'ing the expression...
$pch
[1] "+"
@@ -43,18 +31,7 @@ $id
[1] "pch" "id" ""
Printing the expression to be tryEval'ed...
-[[1]]
-foo
-
-$pch
-[1] "+"
-
-$id
-[1] 123
-
-[[4]]
-[1] TRUE FALSE
-
+foo(pch = "+", id = 123L, c(TRUE, FALSE))
TryEval'ing the expression...
$pch
[1] "+"
@@ -70,6 +47,6 @@ Calling R_getEmbeddingDllInfo...
Sourcing 'embedding.R'...
getDLLRegisteredRoutines('(embedding)'):
.Call .Call.numParameters
-1 twice 2
+1 twice 1
[1] 2 4 6 8 10
DONE
--
GitLab