From 54a08b0483c514201d17921f72a1fc565dbfdcac Mon Sep 17 00:00:00 2001 From: Dmitry Mikhirev Date: Mon, 8 Dec 2014 23:13:33 +0300 Subject: fix tests on travis --- .travis.yml | 2 +- GNUmakefile | 2 +- Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ab11b9..d6fcc9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,4 +11,4 @@ before_install: install: - sudo apt-get install -y libpcre3-dev - pushd /tmp/make-${MAKE_VER} && ./configure && make && sudo make install ; popd -script: /usr/local/bin/make -k check +script: /usr/local/bin/make check diff --git a/GNUmakefile b/GNUmakefile index 25a4e85..08775fa 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -12,7 +12,7 @@ pcre.so: pcre.c $(CC) $(CPPFLAGS) $(CFLAGS) $(MAKE_CFLAGS) -fPIC \ $(LDFLAGS) -shared -o $@ $< $(LIBS) -check: +check: pcre.so $(GNUMAKE4) -k -f tests.mk clean: diff --git a/Makefile b/Makefile index 68fbd32..cf2e6bf 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ pcre.so: pcre.c $(CC) $(CPPFLAGS) $(CFLAGS) $(MAKE_CFLAGS) -fPIC \ $(LDFLAGS) -shared -o $@ $< $(LIBS) -check: +check: pcre.so @if [ -n "`which $(GNUMAKE4)`" ] ; then \ $(GNUMAKE4) -k -f tests.mk ; \ else \ -- cgit v1.2.1