Skip to content

Commit 5294e72

Browse files
author
smeyer
committed
sync installed Makefile for tests (amends c80037)
git-svn-id: https://svn.r-project.org/R/trunk@87769 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent ad05432 commit 5294e72

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

tests/Makefile.install

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,16 @@ MK = $(MAKE)
3030
all-basic-tests = BasePackages Specific Reg Internet
3131
## Keep in line with Makefile.common.
3232
## not Docs Standalone Packages
33-
all-devel-tests = DateTime IsAs Random Demo Primitive Regexp Internet2 CRANtools Segfault Conditions Misc-dev
33+
all-devel-tests = DateTime IsAs Random Demo Primitive Regexp Translation \
34+
Internet2 CRANtools Segfault Conditions Misc-dev
3435

3536

3637
## <NOTE>
3738
## These depend on an internet connection, and the sites being up.
3839
## So allow this to fail: it may be slow doing so.
3940
test-Internet:
4041
@$(ECHO) "running tests of Internet functions"
41-
@$(ECHO) " expect some differences"
4242
-@$(MAKE) $(test-out-internet) RVAL_IF_DIFF=0
43-
44-
# test-Internet2:
45-
# @$(ECHO) "running more Internet and socket tests"
46-
# -@$(MK) $(test-out-internet2) RVAL_IF_DIFF=0
4743
## </NOTE>
4844

4945
test-BasePackages:

tests/Makefile.install.win

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ check-all: check-devel test-Recommended
1616
include $(top_builddir)/etc$(R_ARCH)/Makeconf
1717
include Makefile.common
1818

19+
1920
## GNU gettext disables LANGUAGE if LC_ALL=C, but other systems might not.
2021
R = $(R_HOME)/$(BINDIR)/Rterm --vanilla LANGUAGE=en LC_ALL=C SRCDIR=. R_DEFAULT_PACKAGES=
2122
R2 = $(R_HOME)/$(BINDIR)/Rterm --vanilla SRCDIR=. R_DEFAULT_PACKAGES=
@@ -29,20 +30,16 @@ MK = $(MAKE)
2930
all-basic-tests = BasePackages Specific Reg Internet
3031
## Keep in line with Makefile.common.
3132
## not Docs Standalone Packages
32-
all-devel-tests = DateTime IsAs Random Demo Primitive Regexp Internet2 CRANtools Segfault Conditions Misc-dev
33+
all-devel-tests = DateTime IsAs Random Demo Primitive Regexp Translation \
34+
Internet2 CRANtools Segfault Conditions Misc-dev
3335

3436

3537
## <NOTE>
3638
## These depend on an internet connection, and the sites being up.
3739
## So allow this to fail: it may be slow doing so.
3840
test-Internet:
3941
@$(ECHO) "running tests of Internet functions"
40-
@$(ECHO) " expect some differences"
4142
-@$(MAKE) $(test-out-internet) RVAL_IF_DIFF=0
42-
43-
# test-Internet2:
44-
# @$(ECHO) "running more Internet and socket tests"
45-
# -@$(MK) $(test-out-internet2) RVAL_IF_DIFF=0
4643
## </NOTE>
4744

4845
test-BasePackages:

0 commit comments

Comments
 (0)