Commit 40250509 by Maarten L. Hekkelman

Work around limitation in travis-ci

parent e8d8b8be
...@@ -24,9 +24,9 @@ before_install: ...@@ -24,9 +24,9 @@ before_install:
script: script:
- ./configure - ./configure
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then gmake ; else make ; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then gmake NO_REVISION=1 ; else make NO_REVISION=1 ; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then gmake test ; else make test ; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then gmake test NO_REVISION=1 ; else make test NO_REVISION=1 ; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then sudo gmake install; else sudo make install; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sudo gmake NO_REVISION=1 install; else sudo make install NO_REVISION=1; fi
jobs: jobs:
allow_failures: allow_failures:
......
...@@ -135,10 +135,16 @@ endif ...@@ -135,10 +135,16 @@ endif
REVISION = $(shell git log --pretty=format:%h --max-count=1) REVISION = $(shell git log --pretty=format:%h --max-count=1)
REVISION_FILE = version-info-$(REVISION).txt REVISION_FILE = version-info-$(REVISION).txt
# Unfortunately, travis-ci checks out only with --depth=50, missing the required tag
ifeq "$(NO_REVISION)" ""
$(REVISION_FILE): $(REVISION_FILE):
rm -f version-info-*.txt rm -f version-info-*.txt
git describe --match=build --dirty > $@ git describe --match=build --dirty > $@
@ git log --pretty=medium --date=iso8601 -1 >> $@ @ git log --pretty=medium --date=iso8601 -1 >> $@
else
$(REVISION_FILE):
touch $@
endif
src/revision.hpp: $(REVISION_FILE) src/revision.hpp: $(REVISION_FILE)
@ echo 'const char kRevision[] = R"(' > $@ @ echo 'const char kRevision[] = R"(' > $@
......
...@@ -834,8 +834,6 @@ _cat_2.parent_id3 ...@@ -834,8 +834,6 @@ _cat_2.parent_id3
BOOST_CHECK(cat2.find(cif::Key("parent_id") == 4).size() == 3); BOOST_CHECK(cat2.find(cif::Key("parent_id") == 4).size() == 3);
BOOST_CHECK(cat2.find(cif::Key("parent_id") == 40).size() == 0); BOOST_CHECK(cat2.find(cif::Key("parent_id") == 40).size() == 0);
f.write(std::cout, {});
} }
// -------------------------------------------------------------------- // --------------------------------------------------------------------
...@@ -993,8 +991,6 @@ _cat_2.parent_id3 ...@@ -993,8 +991,6 @@ _cat_2.parent_id3
break; break;
} }
f.write(std::cout, {});
BOOST_CHECK(cat1.size() == 3); BOOST_CHECK(cat1.size() == 3);
BOOST_CHECK(cat2.size() == 7); BOOST_CHECK(cat2.size() == 7);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment