From 110dae2209a738ac59269b376dbb58d45df2b565 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 1 Feb 2017 16:47:18 -0800 Subject: Fix build in canon_perftest_fix unsigned int*, make the same change in canon_perftest. Fixes "./ninja all" build. --- src/canon_perftest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/canon_perftest.cc b/src/canon_perftest.cc index 389ac24..03f4a2f 100644 --- a/src/canon_perftest.cc +++ b/src/canon_perftest.cc @@ -33,7 +33,7 @@ int main() { for (int j = 0; j < 5; ++j) { const int kNumRepetitions = 2000000; int64_t start = GetTimeMillis(); - unsigned int slash_bits; + uint64_t slash_bits; for (int i = 0; i < kNumRepetitions; ++i) { CanonicalizePath(buf, &len, &slash_bits, &err); } -- cgit v0.12 From d611bd405acc9817a4e96f52a042a7a2f06f7812 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 1 Feb 2017 16:49:56 -0800 Subject: Make travis build everything Tell travis to build "all" instead of just "ninja_test". This would have caught the breakage introduced by #1181. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 216b8b0..093139b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,4 +3,4 @@ language: cpp compiler: - gcc - clang -script: ./configure.py --bootstrap && ./ninja ninja_test && ./ninja_test --gtest_filter=-SubprocessTest.SetWithLots && ./misc/ninja_syntax_test.py +script: ./configure.py --bootstrap && ./ninja all && ./ninja_test --gtest_filter=-SubprocessTest.SetWithLots && ./misc/ninja_syntax_test.py -- cgit v0.12