Changeset: 5aae15fed6c9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5aae15fed6c9
Modified Files:
clients/R/Tests/install.sh
testing/Mfilter.py.in
Branch: Oct2014
Log Message:
Test output wrangling
Unterschiede (36 Zeilen):
diff --git a/clients/R/Tests/install.sh b/clients/R/Tests/install.sh
--- a/clients/R/Tests/install.sh
+++ b/clients/R/Tests/install.sh
@@ -2,18 +2,13 @@
# install dependencies first
# R --vanilla --quiet -e
"install.packages(c('MonetDB.R','dplyr','sqlsurvey'),repos=c('http://r-forge.r-project.org','http://cran.rstudio.com/'),type='source')"
-echo "#~BeginVariableOutput~#"
->&2 echo "#~BeginVariableOutput~#"
-
# install local version
-R CMD INSTALL $TSTSRCDIR/../MonetDB.R
+R CMD INSTALL $TSTSRCDIR/../MonetDB.R >> /dev/null 2>&1
# try loading the required packages
-R --vanilla --quiet -e "library(MonetDB.R); library(dplyr); library(sqlsurvey)"
+R --vanilla --quiet -e "library(MonetDB.R); library(dplyr);
library(sqlsurvey)" >> /dev/null 2>&1
RRET=$?
-echo "#~EndVariableOutput~#"
->&2 echo "#~EndVariableOutput~#"
if [ $RRET -eq 0 ];
then
diff --git a/testing/Mfilter.py.in b/testing/Mfilter.py.in
--- a/testing/Mfilter.py.in
+++ b/testing/Mfilter.py.in
@@ -64,6 +64,8 @@ test = (
# table_function_with_column_subselects.Bug-3172 &
create_function.Bug-3172:
# id in error message depends on #threads
r"^.*!TypeException:user.s2_1\[[0-9]+\]:'.*$",
+ # dplyr (R package) includes the MonetDB version in its
output, ignore
+ r"^Source: MonetDB .*$",
])+')', re.MULTILINE),
# warnings and messages that should be treated as errors:
re.compile('(?:'+')|(?:'.join([
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
