diff options
| author | Mike Taves <mwtoews@gmail.com> | 2019-04-05 12:56:58 +1300 |
|---|---|---|
| committer | Mike Taves <mwtoews@gmail.com> | 2019-04-05 17:47:15 +1300 |
| commit | 2c28ca1798cb24b803c44ceebd34bb3f15822c87 (patch) | |
| tree | 5a8ed6d5be8792c145101a3474b73228b58247c5 /travis/install.sh | |
| parent | 1e2e512f9a671df504f6f01eee53dc26939b3c0a (diff) | |
| download | PROJ-2c28ca1798cb24b803c44ceebd34bb3f15822c87.tar.gz PROJ-2c28ca1798cb24b803c44ceebd34bb3f15822c87.zip | |
Adjust test outputs
- Tests should use unified diff with expected results
- Show CMake build compile commands (VERBOSE=1)
- Travis CI only has two cores, so "-j2" is sufficent
Diffstat (limited to 'travis/install.sh')
| -rwxr-xr-x | travis/install.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/travis/install.sh b/travis/install.sh index e37644f4..c8da9046 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -27,7 +27,7 @@ if [ -f /usr/lib/jvm/java-7-openjdk-amd64/include/jni.h ]; then else ../configure --prefix=/tmp/proj_autoconf_install_from_dist_all fi -make -j3 +make -j2 make check make install find /tmp/proj_autoconf_install_from_dist_all @@ -37,7 +37,7 @@ cd .. mkdir build_cmake cd build_cmake cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/proj_cmake_install -make -j3 +VERBOSE=1 make -j2 make install # The cmake build is not able to generate the null file, so copy it at hand cp /tmp/proj_autoconf_install_from_dist_all/share/proj/null /tmp/proj_cmake_install/share/proj @@ -55,7 +55,7 @@ cd ../.. mkdir build_autoconf_grids cd build_autoconf_grids ../configure --prefix=/tmp/proj_autoconf_install_grids -make -j3 +make -j2 make check (cd src && make multistresstest && make test228) PROJ_LIB=../data src/multistresstest @@ -74,7 +74,7 @@ if [ "$BUILD_NAME" != "linux_clang" ]; then else ./configure fi -make -j3 +make -j2 make check # Rerun tests without grids not included in proj-datumgrid |