Skip to content

Commit

Permalink
also test building with gyp on travis
Browse files Browse the repository at this point in the history
  • Loading branch information
Dane Springmeyer committed May 20, 2014
1 parent bc80b31 commit 51eda4f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ before_script:
- if [ "${CXX}" = 'g++' ]; then export CXX="g++-4.7"; export CC="gcc-4.7"; make test bench; make clean; export CXX="g++-4.8"; export CC="gcc-4.8"; make test bench; else make test bench; fi;

script:
- make sizes /usr/include/boost/variant.hpp
- make sizes /usr/include/boost/variant.hpp
- make gyp
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ endif

all: out/bench-variant out/unique_ptr_test out/unique_ptr_test out/recursive_wrapper_test out/binary_visitor_test

./deps/gyp:
git clone --depth 1 https://chromium.googlesource.com/external/gyp.git ./deps/gyp

gyp: ./deps/gyp
deps/gyp/gyp --depth=. -Goutput_dir=./ --generator-output=./out -f make
make V=1 -C ./out tests
./out/Release/tests

out/bench-variant-debug: Makefile test/bench_variant.cpp variant.hpp
mkdir -p ./out
$(CXX) -o out/bench-variant-debug test/bench_variant.cpp -I./ $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS)
Expand Down

0 comments on commit 51eda4f

Please sign in to comment.