diff --git a/.appveyor.yml b/.appveyor.yml index a283cd2a34..ea5051668f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -16,18 +16,13 @@ environment: global: CRAN: http://cloud.r-project.org WARNINGS_ARE_ERRORS: 1 - R_CHECK_ARGS: --no-manual --no-multiarch - R_ARCH: i386 + R_CHECK_ARGS: --no-manual # R_CHECK_ARGS specified in order to turn off --as-cran (on by default) as that can be slow -# multiarch is on by default which (when R_ARCH: x64) compiles and tests both 32bit and 64bit in one x64 job -# --no-multiarch so as to not run both 32bit and 64bit on every commit in PRs to save dev cycle time; GLCI after merge is full-strength -# GHA has MacOS 64bit (test-coverage) and Ubuntu 64bit, therefore picked 32bit for Windows - GCC_PATH: mingw_64 -# Default GCC_PATH appears to be gcc-4.6.3 which is now unsupported as from Rtools.exe v3.4. _R_CHECK_NO_STOP_ON_TEST_ERROR_: true # continue tests even if some script failed _R_CHECK_TESTS_NLINES_: 0 # Block truncation of any error messages in R CMD check +# R is 64-bit only on Windows from 4.2.0 (prior default was build and test both 32bit and 64bit) so we no longer use R_ARCH to pick one to reduce CI time in PRs matrix: diff --git a/inst/tests/tests.Rraw b/inst/tests/tests.Rraw index f453b96208..275b74add4 100644 --- a/inst/tests/tests.Rraw +++ b/inst/tests/tests.Rraw @@ -14600,11 +14600,11 @@ oldenv1 = Sys.getenv("R_DATATABLE_NUM_PROCS_PERCENT") oldenv2 = Sys.getenv("R_DATATABLE_NUM_THREADS") Sys.setenv(R_DATATABLE_NUM_THREADS="") # in case user has this set, so we can test PROCS_PERCENT Sys.setenv(R_DATATABLE_NUM_PROCS_PERCENT="3.0") -test(1997.09, setDTthreads(), old, warning="Ignoring invalid.*Please remove any.*not a digit") +test(1997.09, setDTthreads(), old, ignore.warning="Ignoring invalid.*Please remove any.*not a digit") new = getDTthreads() # old above at (1) may not have been default. new now is. test(1997.10, getDTthreads(), new) Sys.setenv(R_DATATABLE_NUM_PROCS_PERCENT="1") -test(1997.11, setDTthreads(), new, warning="Ignoring invalid.*integer between 2 and 100") +test(1997.11, setDTthreads(), new, ignore.warning="Ignoring invalid.*integer between 2 and 100") test(1997.12, getDTthreads(), new) Sys.setenv(R_DATATABLE_NUM_PROCS_PERCENT="75") test(1997.13, setDTthreads(), new)