s/R3/RCHK/

git-svn-id: https://svn.r-project.org/R/trunk@85668 00db46b3-68df-0310-9c12-caf00c1e9a41
r-devel · Dec 12, 2023 · 88d61c6 · 88d61c6
1 parent 90d07e8
commit 88d61c6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/tests/Makefile.common b/tests/Makefile.common
@@ -501,7 +501,7 @@ test-Packages1-Recommended:
 	    (cd RecPackages && $(TAR) -x -f -) ; \
 	  $(ECHO) "checking package '$${p}'"; \
 	  R_LIBS="$(top_builddir)/library:$${R_LIBS}" \
-	    _R_CHECK_FORCE_SUGGESTS_=FALSE $(R3) --install=skip \
+	    _R_CHECK_FORCE_SUGGESTS_=FALSE $(RCHK) --install=skip \
 	    --library="$(top_builddir)/library" RecPackages/$${p} || $(ECHO); \
 	done
 
@@ -523,7 +523,7 @@ stamp-Packages2: $(PKG_ROBJECTS)
 	    (cd RecPackages && $(TAR) -x -f -) ; \
 	  $(ECHO) "begin checking package '$${p}'"; \
 	  R_LIBS="$(top_builddir)/library:$${R_LIBS}" \
-	 _R_CHECK_FORCE_SUGGESTS_=FALSE $(R3) --install=skip \
+	 _R_CHECK_FORCE_SUGGESTS_=FALSE $(RCHK) --install=skip \
 	    --library="$(top_builddir)/library" RecPackages/$${p}  > $@ 2>&1
 	@cat $@
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
@@ -41,9 +41,9 @@ SUBDIRS_WITH_NO_BUILD = Pkgs
 ## SRCDIR is used by reg-tests-1a.R, reg-IO2.R and reg-packages.R
 ## NB: SRCDIR is not available on windows so make any new tests robust to this
 ## GNU gettext disables LANGUAGE if LC_ALL=C, but other systems might not.
-R = R_LIBS_USER=$(top_builddir)/library LANGUAGE=en LC_ALL=C SRCDIR=$(srcdir) R_DEFAULT_PACKAGES= $(top_builddir)/bin/R --vanilla
+R  = R_LIBS_USER=$(top_builddir)/library LANGUAGE=en LC_ALL=C SRCDIR=$(srcdir) R_DEFAULT_PACKAGES= $(top_builddir)/bin/R --vanilla
 R2 = R_LIBS_USER=$(top_builddir)/library R_DEFAULT_PACKAGES= $(top_builddir)/bin/R --vanilla
-R3 = R_LIBS_USER=$(top_builddir)/library $(top_builddir)/bin/R CMD check
+RCHK = R_LIBS_USER=$(top_builddir)/library $(top_builddir)/bin/R CMD check
 RDIFF = $(top_builddir)/bin/R CMD Rdiff
 RDCONV = LC_CTYPE=C $(top_builddir)/bin/R CMD Rdconv
 RD2PDF = $(top_builddir)/bin/R CMD Rd2pdf --quiet --no-preview --force

diff --git a/tests/Makefile.install b/tests/Makefile.install
@@ -20,7 +20,7 @@ include Makefile.common
 ## GNU gettext disables LANGUAGE if LC_ALL=C, but other systems might not.
 R = LANGUAGE=en LC_ALL=C SRCDIR=$(srcdir) R_DEFAULT_PACKAGES= $(top_builddir)/bin/R --vanilla
 R2 = R_DEFAULT_PACKAGES= $(top_builddir)/bin/R --vanilla
-R3 = $(top_builddir)/bin/R CMD check
+RCHK  = $(top_builddir)/bin/R CMD check
 RDIFF = $(top_builddir)/bin/R CMD Rdiff
 RDCONV = LC_CTYPE=C $(top_builddir)/bin/R CMD Rdconv
 MK = $(MAKE)

diff --git a/tests/Makefile.install.win b/tests/Makefile.install.win
@@ -3,7 +3,7 @@
 # ${R_HOME}/tests/Makefile.install
 
 ## Keep in step with Makefile.install
- 
+
 srcdir = .
 top_srcdir = ..
 
@@ -17,9 +17,9 @@ include $(top_builddir)/etc$(R_ARCH)/Makeconf
 include Makefile.common
 
 ## GNU gettext disables LANGUAGE if LC_ALL=C, but other systems might not.
-R = $(R_HOME)/$(BINDIR)/Rterm --vanilla LANGUAGE=en LC_ALL=C SRCDIR=. R_DEFAULT_PACKAGES=
+R  = $(R_HOME)/$(BINDIR)/Rterm --vanilla LANGUAGE=en LC_ALL=C SRCDIR=. R_DEFAULT_PACKAGES=
 R2 = $(R_HOME)/$(BINDIR)/Rterm --vanilla SRCDIR=. R_DEFAULT_PACKAGES=
-R3 = $(R_HOME)/$(BINDIR)/Rcmd check
+RCHK  = $(R_HOME)/$(BINDIR)/Rcmd check
 RDIFF = $(R_HOME)/$(BINDIR)/R CMD Rdiff
 RVAL_IF_DIFF=0
 ## suppress fancy quotes for diff-ing

diff --git a/tests/Makefile.win b/tests/Makefile.win
@@ -19,9 +19,9 @@ R_HOME = ..
 test-src-sloppy-b = eval-etc-2.R
 include Makefile.common
 
-R = $(R_HOME)/$(BINDIR)/Rterm --vanilla LC_ALL=C SRCDIR=. R_DEFAULT_PACKAGES=
-R2 = $(R_HOME)/$(BINDIR)/Rterm --vanilla SRCDIR=. R_DEFAULT_PACKAGES=
-R3 = $(R_HOME)/$(BINDIR)/Rcmd check
+R    = $(R_HOME)/$(BINDIR)/Rterm --vanilla LC_ALL=C SRCDIR=. R_DEFAULT_PACKAGES=
+R2   = $(R_HOME)/$(BINDIR)/Rterm --vanilla SRCDIR=. R_DEFAULT_PACKAGES=
+RCHK = $(R_HOME)/$(BINDIR)/Rcmd check
 RDIFF = $(R_HOME)/$(BINDIR)/R CMD Rdiff
 RVAL_IF_DIFF=0
 ## suppress fancy quotes for diff-ing