From e921c6e6b08eaf7a2f201cc903e10391ac851f72 Mon Sep 17 00:00:00 2001 From: maechler Date: Thu, 2 Jan 2025 17:25:12 +0000 Subject: [PATCH] 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 --- src/nmath/standalone/Makefile.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/nmath/standalone/Makefile.in b/src/nmath/standalone/Makefile.in index 946795a0439..80b21b3708c 100644 --- a/src/nmath/standalone/Makefile.in +++ b/src/nmath/standalone/Makefile.in @@ -86,16 +86,15 @@ all: Makefile inc static shared inc: Makefile (cd ../../include; $(MAKE) Rmath.h) -## can't run test, as that depends on OS-specific way to set library path. -## clean is useful, but forces a remake each time which MM did not want #check: all # clean check: @rm -f check.log @if test -n "${TEST_MC_CORES}"; then \ $(MAKE) -j ${TEST_MC_CORES} all > check.log 2>&1; \ + $(MAKE) -f test >> check.log 2>&1; \ else \ - $(MAKE) all > check.log 2>&1; \ + $(MAKE) all test > check.log 2>&1; \ fi @$(ECHO) "check output can be found in src/nmath/standalone/check.log" @@ -133,8 +132,8 @@ $(libRmath_la): $(libRmath_la_OBJECTS) $(DYLIB_LINK) -o $@ $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) $(LIBM) test: $(srcdir)/test.c - $(CC) -o $@ $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(srcdir)/test.c \ - -L. -lRmath $(LIBM) + $(CC) -o $@ $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(srcdir)/test.c -L. -lRmath $(LIBM) + ./$@ install: installdirs install-header @WANT_R_FRAMEWORK_FALSE@ install-pc @WANT_R_FRAMEWORK_FALSE@ @!(test -f $(libRmath_la)) || $(SHELL) $(top_srcdir)/tools/copy-if-change $(libRmath_la) $(DESTDIR)$(libdir)/$(libRmath_la)