diff options
| author | Dmitry Mikhirev | 2014-12-08 23:13:33 +0300 |
|---|---|---|
| committer | Dmitry Mikhirev | 2014-12-08 23:13:33 +0300 |
| commit | 54a08b0483c514201d17921f72a1fc565dbfdcac (patch) | |
| tree | b52771a74a5c0f00335bd43b722397a48cf63614 | |
| parent | 4f007f4273d624de1474537ef3ec265b6a621858 (diff) | |
| download | make_pcre-54a08b0483c514201d17921f72a1fc565dbfdcac.tar.gz make_pcre-54a08b0483c514201d17921f72a1fc565dbfdcac.tar.bz2 make_pcre-54a08b0483c514201d17921f72a1fc565dbfdcac.tar.xz make_pcre-54a08b0483c514201d17921f72a1fc565dbfdcac.zip | |
fix tests on travis
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | 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: @@ -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 \ |