Skip to content

Commit e921c6e

Browse files
author
maechler
committed
make check now builds and runs test (as in Makefile.win)
git-svn-id: https://svn.r-project.org/R/trunk@87514 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 5307acb commit e921c6e

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/nmath/standalone/Makefile.in

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,15 @@ all: Makefile inc static shared
8686
inc: Makefile
8787
(cd ../../include; $(MAKE) Rmath.h)
8888

89-
## can't run test, as that depends on OS-specific way to set library path.
90-
## clean is useful, but forces a remake each time which MM did not want
9189
#check: all # clean
9290

9391
check:
9492
@rm -f check.log
9593
@if test -n "${TEST_MC_CORES}"; then \
9694
$(MAKE) -j ${TEST_MC_CORES} all > check.log 2>&1; \
95+
$(MAKE) -f test >> check.log 2>&1; \
9796
else \
98-
$(MAKE) all > check.log 2>&1; \
97+
$(MAKE) all test > check.log 2>&1; \
9998
fi
10099
@$(ECHO) "check output can be found in src/nmath/standalone/check.log"
101100

@@ -133,8 +132,8 @@ $(libRmath_la): $(libRmath_la_OBJECTS)
133132
$(DYLIB_LINK) -o $@ $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) $(LIBM)
134133

135134
test: $(srcdir)/test.c
136-
$(CC) -o $@ $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(srcdir)/test.c \
137-
-L. -lRmath $(LIBM)
135+
$(CC) -o $@ $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(srcdir)/test.c -L. -lRmath $(LIBM)
136+
./$@
138137

139138
install: installdirs install-header @WANT_R_FRAMEWORK_FALSE@ install-pc
140139
@WANT_R_FRAMEWORK_FALSE@ @!(test -f $(libRmath_la)) || $(SHELL) $(top_srcdir)/tools/copy-if-change $(libRmath_la) $(DESTDIR)$(libdir)/$(libRmath_la)

0 commit comments

Comments
 (0)