[GR-14284] Fix: propagate status code of pkgtest.

PullRequest: fastr/1939

Author: fangerer

com.oracle.truffle.r.test.packages/pkgtest/__init__.py

@@ -657,12 +657,24 @@ def installpkgs(args, **kwargs):
 
 
 def pkgtest_cmp(args):
-    with open(args[0]) as f:
+    gnur_filename = args[0]
+    fastr_filename = args[1]
+    if len(args) >= 4:
+        test_output_filters = args[2]
+        pkg_name = args[3]
+    else:
+        test_output_filters = None
+        pkg_name = None
+    dump_preprocessed = args[4] if len(args) >= 5 else None
+
+    filters = select_filters_for_package(args[2], pkg_name) if len(args) >= 3 else None
+
+    with open(gnur_filename) as f:
         gnur_content = f.readlines()
-    with open(args[1]) as f:
+    with open(fastr_filename) as f:
         fastr_content = f.readlines()
     from fuzzy_compare import fuzzy_compare
-    return fuzzy_compare(gnur_content, fastr_content, args[0], args[1])
+    return fuzzy_compare(gnur_content, fastr_content, gnur_filename, fastr_filename, filters, dump_preprocessed)
 
 
 def find_top100(args):

com.oracle.truffle.r.test.packages/test.output.filter

@@ -44,6 +44,10 @@
 # normalize environment addresses
 .* => s/<environment: 0x[0-9A-Fa-f]*>/<environment: 0xCAFEBABE>
 
+# ignore warnings for invalid source references
+.* => D/Warning messages:
+.* => D+0-1/Invalid source reference
+
 # for individual packages:
 
 # ------
@@ -87,7 +91,8 @@ ROCR => D/detaching ‘ROCR.hiv’
 # quantmod: PDF device not supported in saveChart()
 quantmod => D-2/  PDF device not supported.
 quantmod => D/  incomplete final line found
-quantmod => s/There were [0-9]+ warnings \(use warnings\(\) to see them\)/
+quantmod => s/There were [0-9]* or more warnings \(use warnings\(\) to see the first [0-9]*\)/
+quantmod => D+1-1/In read.table(file = file, header = header, sep = sep, quote = quote,  :
 
 # --------
 sqldf => D/A svUnit test suite run in
@@ -111,3 +116,12 @@ clpAPI => D/Clp0006I 1  Obj 3.2368421
 clpAPI => D/Clp0000I Optimal - objective value 3.2368421
 clpAPI => D/Coin0511I After Postsolve, objective 3.2368421, infeasibilities - dual 0 (0), primal 0 (0)
 clpAPI => D/Clp0032I Optimal objective 3.236842105 - 1 iterations time
+
+# --------
+# RcppBDT
+RcppBDT => s/code for methods in class .* was not checked for suspicious field assignments \(recommended package ‘codetools’ not available\?\)/
+
+# --------
+# sqldf
+sqldf => s/There were [0-9]* or more warnings \(use warnings\(\) to see the first [0-9]*\)/
+

mx.fastr/mx_fastr.py

@@ -645,25 +645,25 @@ def _pkgtest_args(args):
 def pkgtest(args, **kwargs):
     full_args = _pkgtest_args(args)
     mx.logv(["pkgtest"] + full_args)
-    pkgtest_load().pkgtest(full_args)
+    return pkgtest_load().pkgtest(full_args)
 
 
 def installpkgs(args, **kwargs):
     full_args = _pkgtest_args(args)
     mx.logv(["installpkgs"] + full_args)
-    pkgtest_load().installpkgs(full_args)
+    return pkgtest_load().installpkgs(full_args)
 
 
 def find_top100(*args, **kwargs):
     full_args = _pkgtest_args(args) + ["100"]
     mx.logv(["find_top"] + full_args)
-    pkgtest_load().find_top(full_args)
+    return pkgtest_load().find_top(full_args)
 
 
 def find_top(*args, **kwargs):
     full_args = _pkgtest_args(args)
     mx.logv(["find_top"] + full_args)
-    pkgtest_load().find_top(args)
+    return pkgtest_load().find_top(args)
 
 
 def r_pkgtest_analyze(args, **kwargs):