Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
21890546 R test results differ for "gmake test" and "gmake system-test"
authorRich Burridge <rich.burridge@oracle.com>
Tue, 26 Jan 2016 07:41:50 -0800
changeset 5338 8cb226fdeab6
parent 5335 5761566a80a8
child 5339 cf0e8b40a0d4
21890546 R test results differ for "gmake test" and "gmake system-test"
components/r/Makefile file | annotate | diff | comparison | revisions
components/r/test/results-all.master file | annotate | diff | comparison | revisions
components/r/test/results-i386.master file | annotate | diff | comparison | revisions
components/r/test/results-sparc.master file | annotate | diff | comparison | revisions 
--- a/components/r/Makefile	Thu Jan 21 17:20:36 2016 -0800
+++ b/components/r/Makefile	Tue Jan 26 07:41:50 2016 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -105,21 +105,22 @@
 COMPONENT_TEST_ENV_CMD =	ulimit -Ss 32768 ; $(ENV)
 COMPONENT_SYSTEM_TEST_ENV_CMD =	ulimit -Ss 32768 ; $(ENV)
 
-# Master test results are different between x86 and SPARC.
-COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-$(MACH).master
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
 
 COMPONENT_TEST_TRANSFORMS += \
 	'-n ' \
 	'-e "/^Testing examples for package /p" ' \
-	'-e "/^  comparing /p" ' \
 	'-e "/^running /p" ' \
-	'-e "/^  expect some differences/p" '
+	'-e "/^  expect some differences/p" ' \
+	'-e "/comparing.*datetime.Rout/d" ' \
+	'-e "/comparing.*reg-examples3.Rout/d" ' \
+	'-e "/^  comparing /p" '
 
 ASLR_MODE = $(ASLR_ENABLE)
 
 # Use the installed version of R, not the one in the build area.
 # These definitions override those found in .../test/Makefile.
-COMPONENT_SYSTEM_TEST_ARGS += R="LANGUAGE=en LC_ALL=C SRCDIR=$(srcdir) R_DEFAULT_PACKAGES= /usr/bin/R --vanilla"
+COMPONENT_SYSTEM_TEST_ARGS += R="LANGUAGE=en LC_ALL=C SRCDIR=$(BUILD_DIR_64)/tests R_DEFAULT_PACKAGES= /usr/bin/R --vanilla"
 COMPONENT_SYSTEM_TEST_ARGS += R2="R_DEFAULT_PACKAGES= /usr/bin/R --vanilla"
 COMPONENT_SYSTEM_TEST_ARGS += R3="/usr/bin/R CMD check"
 COMPONENT_SYSTEM_TEST_ARGS += RDIFF="/usr/bin/R CMD Rdiff"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/r/test/results-all.master	Tue Jan 26 07:41:50 2016 -0800
@@ -0,0 +1,84 @@
+Testing examples for package 'base'
+Testing examples for package 'tools'
+  comparing 'tools-Ex.Rout' to 'tools-Ex.Rout.save' ...
+Testing examples for package 'utils'
+Testing examples for package 'grDevices'
+  comparing 'grDevices-Ex.Rout' to 'grDevices-Ex.Rout.save' ... OK
+Testing examples for package 'graphics'
+  comparing 'graphics-Ex.Rout' to 'graphics-Ex.Rout.save' ... OK
+Testing examples for package 'stats'
+  comparing 'stats-Ex.Rout' to 'stats-Ex.Rout.save' ...
+Testing examples for package 'datasets'
+  comparing 'datasets-Ex.Rout' to 'datasets-Ex.Rout.save' ... OK
+Testing examples for package 'methods'
+Testing examples for package 'grid'
+  comparing 'grid-Ex.Rout' to 'grid-Ex.Rout.save' ... OK
+Testing examples for package 'splines'
+  comparing 'splines-Ex.Rout' to 'splines-Ex.Rout.save' ... OK
+Testing examples for package 'stats4'
+  comparing 'stats4-Ex.Rout' to 'stats4-Ex.Rout.save' ... OK
+Testing examples for package 'tcltk'
+Testing examples for package 'compiler'
+Testing examples for package 'parallel'
+running strict specific tests
+running code in 'eval-etc.R' ... OK
+  comparing 'eval-etc.Rout' to '$(SOURCE_DIR)/tests/eval-etc.Rout.save' ... OK
+running code in 'simple-true.R' ... OK
+  comparing 'simple-true.Rout' to '$(SOURCE_DIR)/tests/simple-true.Rout.save' ... OK
+running code in 'arith-true.R' ... OK
+  comparing 'arith-true.Rout' to '$(SOURCE_DIR)/tests/arith-true.Rout.save' ... OK
+running code in 'arith.R' ... OK
+  comparing 'arith.Rout' to '$(SOURCE_DIR)/tests/arith.Rout.save' ... OK
+running code in 'lm-tests.R' ... OK
+  comparing 'lm-tests.Rout' to '$(SOURCE_DIR)/tests/lm-tests.Rout.save' ... OK
+running code in 'ok-errors.R' ... OK
+  comparing 'ok-errors.Rout' to '$(SOURCE_DIR)/tests/ok-errors.Rout.save' ... OK
+running code in 'method-dispatch.R' ... OK
+  comparing 'method-dispatch.Rout' to '$(SOURCE_DIR)/tests/method-dispatch.Rout.save' ... OK
+running code in 'array-subset.R' ... OK
+  comparing 'array-subset.Rout' to '$(SOURCE_DIR)/tests/array-subset.Rout.save' ... OK
+running code in 'any-all.R' ... OK
+  comparing 'any-all.Rout' to '$(SOURCE_DIR)/tests/any-all.Rout.save' ... OK
+running code in 'd-p-q-r-tests.R' ... OK
+  comparing 'd-p-q-r-tests.Rout' to '$(SOURCE_DIR)/tests/d-p-q-r-tests.Rout.save' ... OK
+running sloppy specific tests
+running code in 'complex.R' ... OK
+  comparing 'complex.Rout' to '$(SOURCE_DIR)/tests/complex.Rout.save' ... OK
+running code in 'print-tests.R' ... OK
+  comparing 'print-tests.Rout' to '$(SOURCE_DIR)/tests/print-tests.Rout.save' ... OK
+running code in 'lapack.R' ... OK
+  comparing 'lapack.Rout' to '$(SOURCE_DIR)/tests/lapack.Rout.save' ... OK
+running code in 'datasets.R' ... OK
+  comparing 'datasets.Rout' to '$(SOURCE_DIR)/tests/datasets.Rout.save' ... OK
+running code in 'datetime.R' ... OK
+running code in 'iec60559.R' ... OK
+  comparing 'iec60559.Rout' to '$(SOURCE_DIR)/tests/iec60559.Rout.save' ... OK
+running regression tests ...
+running code in 'reg-tests-1a.R' ... OK
+running code in 'reg-tests-1b.R' ...$(SOURCE_DIR)/tests/Makefile.common:93: recipe for target 'reg-tests-1b.Rout' failed
+running code in 'reg-tests-1c.R' ... OK
+running code in 'reg-tests-2.R' ... OK
+  comparing 'reg-tests-2.Rout' to '$(SOURCE_DIR)/tests/reg-tests-2.Rout.save' ... OK
+running code in 'reg-examples1.R' ... OK
+running code in 'reg-examples2.R' ... OK
+running code in 'reg-packages.R' ... OK
+running code in 'p-qbeta-strict-tst.R' ... OK
+running code in 'reg-IO.R' ... OK
+  comparing 'reg-IO.Rout' to '$(SOURCE_DIR)/tests/reg-IO.Rout.save' ... OK
+running code in 'reg-IO2.R' ... OK
+  comparing 'reg-IO2.Rout' to '$(SOURCE_DIR)/tests/reg-IO2.Rout.save' ... OK
+running code in 'reg-plot.R' ... OK
+  comparing 'reg-plot.pdf' to '$(SOURCE_DIR)/tests/reg-plot.pdf.save' ... OK
+running code in 'reg-S4.R' ... OK
+  comparing 'reg-S4.Rout' to '$(SOURCE_DIR)/tests/reg-S4.Rout.save' ... OK
+running code in 'reg-BLAS.R' ... OK
+running code in 'reg-tests-3.R' ... OK
+  comparing 'reg-tests-3.Rout' to '$(SOURCE_DIR)/tests/reg-tests-3.Rout.save' ... OK
+running code in 'reg-examples3.R' ... OK
+running tests of plotting Latin-1
+running code in 'reg-plot-latin1.R' ... OK
+  comparing 'reg-plot-latin1.pdf' to '$(SOURCE_DIR)/tests/reg-plot-latin1.pdf.save' ...261c261
+running tests of Internet functions
+  expect some differences
+running code in 'internet.R' ...$(SOURCE_DIR)/tests/Makefile.common:93: recipe for target 'internet.Rout' failed
+  comparing 'internet.Rout' to '$(SOURCE_DIR)/tests/internet.Rout.save' ...17c17
--- a/components/r/test/results-i386.master	Thu Jan 21 17:20:36 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-Testing examples for package 'base'
-Testing examples for package 'tools'
-  comparing 'tools-Ex.Rout' to 'tools-Ex.Rout.save' ...
-Testing examples for package 'utils'
-Testing examples for package 'grDevices'
-  comparing 'grDevices-Ex.Rout' to 'grDevices-Ex.Rout.save' ... OK
-Testing examples for package 'graphics'
-  comparing 'graphics-Ex.Rout' to 'graphics-Ex.Rout.save' ... OK
-Testing examples for package 'stats'
-  comparing 'stats-Ex.Rout' to 'stats-Ex.Rout.save' ...
-Testing examples for package 'datasets'
-  comparing 'datasets-Ex.Rout' to 'datasets-Ex.Rout.save' ... OK
-Testing examples for package 'methods'
-Testing examples for package 'grid'
-  comparing 'grid-Ex.Rout' to 'grid-Ex.Rout.save' ... OK
-Testing examples for package 'splines'
-  comparing 'splines-Ex.Rout' to 'splines-Ex.Rout.save' ... OK
-Testing examples for package 'stats4'
-  comparing 'stats4-Ex.Rout' to 'stats4-Ex.Rout.save' ... OK
-Testing examples for package 'tcltk'
-Testing examples for package 'compiler'
-Testing examples for package 'parallel'
-running strict specific tests
-running code in 'eval-etc.R' ... OK
-  comparing 'eval-etc.Rout' to '$(SOURCE_DIR)/tests/eval-etc.Rout.save' ... OK
-running code in 'simple-true.R' ... OK
-  comparing 'simple-true.Rout' to '$(SOURCE_DIR)/tests/simple-true.Rout.save' ... OK
-running code in 'arith-true.R' ... OK
-  comparing 'arith-true.Rout' to '$(SOURCE_DIR)/tests/arith-true.Rout.save' ... OK
-running code in 'arith.R' ... OK
-  comparing 'arith.Rout' to '$(SOURCE_DIR)/tests/arith.Rout.save' ... OK
-running code in 'lm-tests.R' ... OK
-  comparing 'lm-tests.Rout' to '$(SOURCE_DIR)/tests/lm-tests.Rout.save' ... OK
-running code in 'ok-errors.R' ... OK
-  comparing 'ok-errors.Rout' to '$(SOURCE_DIR)/tests/ok-errors.Rout.save' ... OK
-running code in 'method-dispatch.R' ... OK
-  comparing 'method-dispatch.Rout' to '$(SOURCE_DIR)/tests/method-dispatch.Rout.save' ... OK
-running code in 'array-subset.R' ... OK
-  comparing 'array-subset.Rout' to '$(SOURCE_DIR)/tests/array-subset.Rout.save' ... OK
-running code in 'any-all.R' ... OK
-  comparing 'any-all.Rout' to '$(SOURCE_DIR)/tests/any-all.Rout.save' ... OK
-running code in 'd-p-q-r-tests.R' ... OK
-  comparing 'd-p-q-r-tests.Rout' to '$(SOURCE_DIR)/tests/d-p-q-r-tests.Rout.save' ... OK
-running sloppy specific tests
-running code in 'complex.R' ... OK
-  comparing 'complex.Rout' to '$(SOURCE_DIR)/tests/complex.Rout.save' ... OK
-running code in 'print-tests.R' ... OK
-  comparing 'print-tests.Rout' to '$(SOURCE_DIR)/tests/print-tests.Rout.save' ... OK
-running code in 'lapack.R' ... OK
-  comparing 'lapack.Rout' to '$(SOURCE_DIR)/tests/lapack.Rout.save' ... OK
-running code in 'datasets.R' ... OK
-  comparing 'datasets.Rout' to '$(SOURCE_DIR)/tests/datasets.Rout.save' ... OK
-running code in 'datetime.R' ... OK
-  comparing 'datetime.Rout' to '$(SOURCE_DIR)/tests/datetime.Rout.save' ... OK
-running code in 'iec60559.R' ... OK
-  comparing 'iec60559.Rout' to '$(SOURCE_DIR)/tests/iec60559.Rout.save' ... OK
-running regression tests ...
-running code in 'reg-tests-1a.R' ... OK
-running code in 'reg-tests-1b.R' ...make[4]: [reg-tests-1b.Rout] Error 1 (ignored)
-running code in 'reg-tests-1c.R' ... OK
-running code in 'reg-tests-2.R' ... OK
-  comparing 'reg-tests-2.Rout' to '$(SOURCE_DIR)/tests/reg-tests-2.Rout.save' ... OK
-running code in 'reg-examples1.R' ... OK
-running code in 'reg-examples2.R' ... OK
-running code in 'reg-packages.R' ... OK
-running code in 'p-qbeta-strict-tst.R' ... OK
-running code in 'reg-IO.R' ... OK
-  comparing 'reg-IO.Rout' to '$(SOURCE_DIR)/tests/reg-IO.Rout.save' ... OK
-running code in 'reg-IO2.R' ... OK
-  comparing 'reg-IO2.Rout' to '$(SOURCE_DIR)/tests/reg-IO2.Rout.save' ... OK
-running code in 'reg-plot.R' ... OK
-  comparing 'reg-plot.pdf' to '$(SOURCE_DIR)/tests/reg-plot.pdf.save' ... OK
-running code in 'reg-S4.R' ... OK
-  comparing 'reg-S4.Rout' to '$(SOURCE_DIR)/tests/reg-S4.Rout.save' ... OK
-running code in 'reg-BLAS.R' ... OK
-running code in 'reg-tests-3.R' ... OK
-  comparing 'reg-tests-3.Rout' to '$(SOURCE_DIR)/tests/reg-tests-3.Rout.save' ... OK
-running code in 'reg-examples3.R' ... OK
-  comparing 'reg-examples3.Rout' to '$(SOURCE_DIR)/tests/reg-examples3.Rout.save' ...371c371
-running tests of plotting Latin-1
-running code in 'reg-plot-latin1.R' ... OK
-  comparing 'reg-plot-latin1.pdf' to '$(SOURCE_DIR)/tests/reg-plot-latin1.pdf.save' ...261c261
-running tests of Internet functions
-  expect some differences
-running code in 'internet.R' ...make[4]: [internet.Rout] Error 1 (ignored)
-  comparing 'internet.Rout' to '$(SOURCE_DIR)/tests/internet.Rout.save' ...17c17
--- a/components/r/test/results-sparc.master	Thu Jan 21 17:20:36 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-Testing examples for package 'base'
-Testing examples for package 'tools'
-  comparing 'tools-Ex.Rout' to 'tools-Ex.Rout.save' ...
-Testing examples for package 'utils'
-Testing examples for package 'grDevices'
-  comparing 'grDevices-Ex.Rout' to 'grDevices-Ex.Rout.save' ... OK
-Testing examples for package 'graphics'
-  comparing 'graphics-Ex.Rout' to 'graphics-Ex.Rout.save' ... OK
-Testing examples for package 'stats'
-  comparing 'stats-Ex.Rout' to 'stats-Ex.Rout.save' ...
-Testing examples for package 'datasets'
-  comparing 'datasets-Ex.Rout' to 'datasets-Ex.Rout.save' ... OK
-Testing examples for package 'methods'
-Testing examples for package 'grid'
-  comparing 'grid-Ex.Rout' to 'grid-Ex.Rout.save' ... OK
-Testing examples for package 'splines'
-  comparing 'splines-Ex.Rout' to 'splines-Ex.Rout.save' ... OK
-Testing examples for package 'stats4'
-  comparing 'stats4-Ex.Rout' to 'stats4-Ex.Rout.save' ... OK
-Testing examples for package 'tcltk'
-Testing examples for package 'compiler'
-Testing examples for package 'parallel'
-running strict specific tests
-running code in 'eval-etc.R' ... OK
-  comparing 'eval-etc.Rout' to '$(SOURCE_DIR)/tests/eval-etc.Rout.save' ... OK
-running code in 'simple-true.R' ... OK
-  comparing 'simple-true.Rout' to '$(SOURCE_DIR)/tests/simple-true.Rout.save' ... OK
-running code in 'arith-true.R' ... OK
-  comparing 'arith-true.Rout' to '$(SOURCE_DIR)/tests/arith-true.Rout.save' ... OK
-running code in 'arith.R' ... OK
-  comparing 'arith.Rout' to '$(SOURCE_DIR)/tests/arith.Rout.save' ... OK
-running code in 'lm-tests.R' ... OK
-  comparing 'lm-tests.Rout' to '$(SOURCE_DIR)/tests/lm-tests.Rout.save' ... OK
-running code in 'ok-errors.R' ... OK
-  comparing 'ok-errors.Rout' to '$(SOURCE_DIR)/tests/ok-errors.Rout.save' ... OK
-running code in 'method-dispatch.R' ... OK
-  comparing 'method-dispatch.Rout' to '$(SOURCE_DIR)/tests/method-dispatch.Rout.save' ... OK
-running code in 'array-subset.R' ... OK
-  comparing 'array-subset.Rout' to '$(SOURCE_DIR)/tests/array-subset.Rout.save' ... OK
-running code in 'any-all.R' ... OK
-  comparing 'any-all.Rout' to '$(SOURCE_DIR)/tests/any-all.Rout.save' ... OK
-running code in 'd-p-q-r-tests.R' ... OK
-  comparing 'd-p-q-r-tests.Rout' to '$(SOURCE_DIR)/tests/d-p-q-r-tests.Rout.save' ... OK
-running sloppy specific tests
-running code in 'complex.R' ... OK
-  comparing 'complex.Rout' to '$(SOURCE_DIR)/tests/complex.Rout.save' ... OK
-running code in 'print-tests.R' ... OK
-  comparing 'print-tests.Rout' to '$(SOURCE_DIR)/tests/print-tests.Rout.save' ... OK
-running code in 'lapack.R' ... OK
-  comparing 'lapack.Rout' to '$(SOURCE_DIR)/tests/lapack.Rout.save' ... OK
-running code in 'datasets.R' ... OK
-  comparing 'datasets.Rout' to '$(SOURCE_DIR)/tests/datasets.Rout.save' ... OK
-running code in 'datetime.R' ... OK
-  comparing 'datetime.Rout' to '$(SOURCE_DIR)/tests/datetime.Rout.save' ...42c42
-running code in 'iec60559.R' ... OK
-  comparing 'iec60559.Rout' to '$(SOURCE_DIR)/tests/iec60559.Rout.save' ... OK
-running regression tests ...
-running code in 'reg-tests-1a.R' ... OK
-running code in 'reg-tests-1b.R' ...make[4]: [reg-tests-1b.Rout] Error 1 (ignored)
-running code in 'reg-tests-1c.R' ... OK
-running code in 'reg-tests-2.R' ... OK
-  comparing 'reg-tests-2.Rout' to '$(SOURCE_DIR)/tests/reg-tests-2.Rout.save' ... OK
-running code in 'reg-examples1.R' ... OK
-running code in 'reg-examples2.R' ... OK
-running code in 'reg-packages.R' ... OK
-running code in 'p-qbeta-strict-tst.R' ... OK
-running code in 'reg-IO.R' ... OK
-  comparing 'reg-IO.Rout' to '$(SOURCE_DIR)/tests/reg-IO.Rout.save' ... OK
-running code in 'reg-IO2.R' ... OK
-  comparing 'reg-IO2.Rout' to '$(SOURCE_DIR)/tests/reg-IO2.Rout.save' ... OK
-running code in 'reg-plot.R' ... OK
-  comparing 'reg-plot.pdf' to '$(SOURCE_DIR)/tests/reg-plot.pdf.save' ... OK
-running code in 'reg-S4.R' ... OK
-  comparing 'reg-S4.Rout' to '$(SOURCE_DIR)/tests/reg-S4.Rout.save' ... OK
-running code in 'reg-BLAS.R' ... OK
-running code in 'reg-tests-3.R' ... OK
-  comparing 'reg-tests-3.Rout' to '$(SOURCE_DIR)/tests/reg-tests-3.Rout.save' ... OK
-running code in 'reg-examples3.R' ... OK
-  comparing 'reg-examples3.Rout' to '$(SOURCE_DIR)/tests/reg-examples3.Rout.save' ...304c304
-running tests of plotting Latin-1
-running code in 'reg-plot-latin1.R' ... OK
-  comparing 'reg-plot-latin1.pdf' to '$(SOURCE_DIR)/tests/reg-plot-latin1.pdf.save' ...261c261
-running tests of Internet functions
-  expect some differences
-running code in 'internet.R' ...make[4]: [internet.Rout] Error 1 (ignored)
-  comparing 'internet.Rout' to '$(SOURCE_DIR)/tests/internet.Rout.save' ...17c17
upstream/oracle/userland-gate