diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-09 16:55:29 -0700 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-09 16:55:29 -0700 |
commit | 8e4fd1b4e8a1b29faefaff1ce794b7a2f607d994 (patch) | |
tree | b94d99ad1a1cd15a7c636b2453b293bb0b095789 /tests.sh | |
parent | a4862e790ec34a902b322e22e92acc049b63941d (diff) | |
parent | fe80059c8d5d78f73b9b3bd0f6276c7b05a3f574 (diff) | |
download | protobuf-8e4fd1b4e8a1b29faefaff1ce794b7a2f607d994.tar.gz protobuf-8e4fd1b4e8a1b29faefaff1ce794b7a2f607d994.tar.bz2 protobuf-8e4fd1b4e8a1b29faefaff1ce794b7a2f607d994.zip |
Merge remote-tracking branch 'google/master' into integration_baseintegration_base
Diffstat (limited to 'tests.sh')
-rwxr-xr-x | tests.sh | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -18,12 +18,12 @@ internal_build_cpp() { ./autogen.sh ./configure CXXFLAGS="-fPIC" # -fPIC is needed for python cpp test. # See python/setup.py for more details - make -j2 + make -j4 } build_cpp() { internal_build_cpp - make check -j2 || (cat src/test-suite.log; false) + make check -j4 || (cat src/test-suite.log; false) cd conformance && make test_cpp && cd .. # The benchmark code depends on cmake, so test if it is installed before @@ -68,7 +68,7 @@ build_cpp_distcheck() { fi # Do the regular dist-check for C++. - make distcheck -j2 + make distcheck -j4 } build_csharp() { |