diff --git a/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/testrffi.c b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/testrffi.c index 31bf84afcfd1424aa6f013e9dc024ad96a9cf81a..a705c1cd9ca1f9715766560a7bf353c0c3e4de79 100644 --- a/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/testrffi.c +++ b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/testrffi.c @@ -167,7 +167,7 @@ SEXP interactive(void) { } SEXP tryEval(SEXP expr, SEXP env) { - int error; + int error = 0; SEXP r = R_tryEval(expr, env, &error); SEXP v; PROTECT(v = allocVector(VECSXP, 2)); diff --git a/com.oracle.truffle.r.test.packages/r/install.packages.R b/com.oracle.truffle.r.test.packages/r/install.packages.R index b34e598cb436550781a2f627df5c48d9f4d5dcff..f16cc75830be5e09ccd97c5a74b767e5bdc58ced 100644 --- a/com.oracle.truffle.r.test.packages/r/install.packages.R +++ b/com.oracle.truffle.r.test.packages/r/install.packages.R @@ -240,9 +240,9 @@ create.blacklist.with <- function(blacklist, iter) { this.blacklist } -# iteratively adds to blacklist until no new blackisted packages are found +# iteratively adds to blacklist until no new blacklisted packages are found create.blacklist.iter <- function(blacklist) { - v <-blacklist + v <- if(is.null(blacklist)) character(0) else blacklist result <-v iter <- 1 while (length(v) > 0) { @@ -871,7 +871,7 @@ parse.args <- function() { usage() } else if (a == "--verbose" || a == "-v") { verbose <<- T - } else if (a == "-V") { + } else if (a == "-V" || a == "--very-verbose") { verbose <<- T very.verbose <<- T } else if (a == "--quiet") { diff --git a/mx.fastr/mx_fastr_pkgs.py b/mx.fastr/mx_fastr_pkgs.py index 296d62e6a82e0a212a3e9147914f22ab37ea31e1..01c06cdd18d173999e700a5a4b2560a662021911 100644 --- a/mx.fastr/mx_fastr_pkgs.py +++ b/mx.fastr/mx_fastr_pkgs.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2016, 2018, 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 @@ -656,6 +656,8 @@ def _fuzzy_compare(gnur_content, fastr_content, gnur_filename, fastr_filename, v if gnur_line is None or fastr_line is None: # fail if FastR's output is shorter than GnuR's if gnur_line is not None and fastr_line is None: + if verbose: + print "FastR's output is shorter than GnuR's" overall_result = 1 break @@ -707,6 +709,12 @@ def _fuzzy_compare(gnur_content, fastr_content, gnur_filename, fastr_filename, v # report a mismatch or success if result == 1: + if verbose: + print gnur_filename + ':%d' % (gnur_cur_statement_start+1) + ' vs. ' + fastr_filename + ':%d' % (fastr_cur_statement_start+1) + print gnur_line.strip() + print "vs." + print fastr_line.strip() + # we need to synchronize the indices such that we can continue sync = True # report the last statement to produce different output @@ -715,12 +723,9 @@ def _fuzzy_compare(gnur_content, fastr_content, gnur_filename, fastr_filename, v statements_passed.remove(fastr_cur_statement_start) statements_failed.add(fastr_cur_statement_start) - # for compatibility: print the first difference - if verbose: - print gnur_filename + ':%d' % (gnur_cur_statement_start+1) + ' vs. ' + fastr_filename + ':%d' % (fastr_cur_statement_start+1) - print gnur_line.strip() - print "vs." - print fastr_line.strip() + # set overall result and reset temporary result + overall_result = 1 + result = 0 else: assert result == 0 if fastr_cur_statement_start not in statements_failed: @@ -744,9 +749,6 @@ def _fuzzy_compare(gnur_content, fastr_content, gnur_filename, fastr_filename, v gnur_i = gnur_i + 1 if ni > 0: fastr_i = ni - - overall_result = 1 - result = 0 else: # just advance by one line in FastR and GnuR gnur_i = gnur_i + 1