Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

update

git-svn-id: https://svn.r-project.org/R/trunk@62386 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
commit 9c4a88ac57a91455127bdddf990522e334903689 1 parent fcaeb74
ripley authored
Showing with 24 additions and 17 deletions.
  1. +7 −4 src/library/tools/R/testing.R
  2. +17 −13 src/library/tools/man/Rdiff.Rd
View
11 src/library/tools/R/testing.R
@@ -1,7 +1,7 @@
# File src/library/tools/R/testing.R
# Part of the R package, http://www.R-project.org
#
-# Copyright (C) 1995-2012 The R Core Team
+# Copyright (C) 1995-2013 The R Core Team
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -485,8 +485,9 @@ testInstalledBasic <- function(scope = c("basic", "devel", "both"))
## We need to force C collation: might not work
Sys.setlocale("LC_COLLATE", "C")
tests1 <- c("eval-etc", "simple-true", "arith-true", "lm-tests",
- "ok-errors", "method-dispatch", "d-p-q-r-tests")
- tests2 <- c("complex", "print-tests", "lapack", "datasets")
+ "ok-errors", "method-dispatch", "array-subset",
+ "any-all", "d-p-q-r-tests")
+ tests2 <- c("complex", "print-tests", "lapack", "datasets", "iec60559")
tests3 <- c("reg-tests-1a", "reg-tests-1b", "reg-tests-1c", "reg-tests-2",
"reg-examples1", "reg-examples2", "reg-packages",
"reg-IO", "reg-IO2", "reg-S4", "reg-plot", "reg-BLAS")
@@ -498,8 +499,10 @@ testInstalledBasic <- function(scope = c("basic", "devel", "both"))
if (!file.exists(fin <- paste0(f, "in")))
stop("file ", sQuote(f), " not found", domain = NA)
message("creating ", sQuote(f), domain = NA)
+ ## FIXME: this creates an extra trailing space compared to
+ ## .Rin.R rule
cmd <- paste(shQuote(file.path(R.home("bin"), "R")),
- "CMD BATCH --no-timing --vanilla --slave", fin)
+ "--vanilla --slave -f", fin)
if (system(cmd))
stop("creation of ", sQuote(f), " failed", domain = NA)
on.exit(unlink(f))
View
30 src/library/tools/man/Rdiff.Rd
@@ -1,6 +1,6 @@
% File src/library/tools/man/Rdiff.Rd
% Part of the R package, http://www.R-project.org
-% Copyright 2010-11 R Core Team
+% Copyright 2010-13 R Core Team
% Distributed under GPL 2 or later
\name{Rdiff}
@@ -27,19 +27,23 @@ Rdiff(from, to, useDiff = FALSE, forEx = FALSE,
}
\details{
The \R startup banner and any timing information from \command{R CMD
- BATCH} are removed from both files, together with lines about loading
- packages. UTF-8 fancy quotes (see \code{\link{sQuote}}) and on
- Windows, Windows' so-called \sQuote{smart quotes} are mapped to a
- simple quote. Addresses of environments, compiled bytecode and other
- exotic types expressed as hex addresses (e.g. \code{<environment:
- 0x12345678>}) are mapped to \code{0x00000000}. The files are then
- compared line-by-line. If there are the same number of lines and
- \code{useDiff} is false, a simple \command{diff}-like display of
- differences is printed, otherwise \command{diff -bw} is called on the
- edited files.
+ BATCH} are removed from both files, together with lines about
+ loading packages. UTF-8 fancy quotes (see \code{\link{sQuote}}) and
+ on Windows, Windows' so-called \sQuote{smart quotes}, are mapped to
+ a simple quote. Addresses of environments, compiled bytecode and
+ other exotic types expressed as hex addresses
+ (e.g. \code{<environment: 0x12345678>}) are mapped to
+ \code{0x00000000}. The files are then compared line-by-line. If
+ there are the same number of lines and \code{useDiff} is false, a
+ simple \command{diff}-like display of differences is printed (which
+ ignores differences in consecutive spaces), otherwise \command{diff
+ -bw} is called on the edited files. (This tries to ignore all
+ differences in whitespace: note that flag \option{-w} is not
+ required by POSIX but is supported by GNU, Solaris and FreeBSD
+ versions.)
- As from \R 2.14.0 this can compare uncompressed PDF files, ignoring
- differences in creation and modification dates.
+ This can compare uncompressed PDF files, ignoring differences in
+ creation and modification dates.
}
\value{
If \code{Log} is true, a list with components \code{status} (see
Please sign in to comment.
Something went wrong with that request. Please try again.