diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2016-02-18 19:13:07 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-03-02 14:51:09 -0800 |
| commit | d33e93b83367ea4dfabeed9cda03bc06a1ff0f6a (patch) | |
| tree | 83f5b0c86d1d255cde3b5dfd6100a6988472ac47 /tools/run_tests/tests.sh | |
| parent | 57be1d7eb25432b9f0106d64faed323ef954f7d2 (diff) | |
| download | protobuf-d33e93b83367ea4dfabeed9cda03bc06a1ff0f6a.tar.gz protobuf-d33e93b83367ea4dfabeed9cda03bc06a1ff0f6a.tar.bz2 protobuf-d33e93b83367ea4dfabeed9cda03bc06a1ff0f6a.zip | |
Added ccache support.
Diffstat (limited to 'tools/run_tests/tests.sh')
| -rw-r--r-- | tools/run_tests/tests.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/run_tests/tests.sh b/tools/run_tests/tests.sh index f1c7e969..a6ba1405 100644 --- a/tools/run_tests/tests.sh +++ b/tools/run_tests/tests.sh @@ -4,7 +4,7 @@ # For when some other test needs the C++ main build, including protoc and # libprotobuf. internal_build_cpp() { - if [ $(uname -s) == "Linux" && "$TRAVIS" == "true" ]; then + if [[ $(uname -s) == "Linux" && "$TRAVIS" == "true" ]]; then # Install GCC 4.8 to replace the default GCC 4.6. We need 4.8 for more # decent C++ 11 support in order to compile conformance tests. sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y @@ -15,19 +15,19 @@ internal_build_cpp() { ./autogen.sh ./configure - make -j2 + make $PARALLELISM } build_cpp() { internal_build_cpp - make check -j2 + make check $PARALLELISM cd conformance && make test_cpp && cd .. } build_cpp_distcheck() { ./autogen.sh ./configure - make distcheck -j2 + make distcheck $PARALLELISM } build_csharp() { |