From 63d4a8a6e22c9614295fa813391b3bc16ac83530 Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Tue, 14 Jun 2016 14:10:51 +0200
Subject: [PATCH] rename ContainsError and ContainsWarning in TestRBase as well
---
.../src/com/oracle/truffle/r/test/S4/R/allocation3.R | 2 +-
.../src/com/oracle/truffle/r/test/TestRBase.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/S4/R/allocation3.R b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/S4/R/allocation3.R
index dc24bb5415..c1c253979c 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/S4/R/allocation3.R
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/S4/R/allocation3.R
@@ -1,4 +1,4 @@
-# ContainsError
+# IgnoreErrorContext
# test from Hadley Wickham's book
setClass("Person", representation(name = "character", age = "numeric"))
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestRBase.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestRBase.java
index 3e941446be..bb429d6d97 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestRBase.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestRBase.java
@@ -83,9 +83,9 @@ public class TestRBase extends TestBase {
l = l.trim();
if (l.startsWith("#")) {
// check the first line for configuration options
- if (l.contains("ContainsError")) {
+ if (l.contains("IgnoreErrorContext")) {
testTrait = Output.IgnoreErrorContext;
- } else if (l.contains("ContainsWarning")) {
+ } else if (l.contains("IgnoreWarningContext")) {
testTrait = Output.IgnoreWarningContext;
}
}
--
GitLab