From 2c28ca1798cb24b803c44ceebd34bb3f15822c87 Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Fri, 5 Apr 2019 12:56:58 +1300 Subject: 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 --- travis/mingw32/install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'travis/mingw32') diff --git a/travis/mingw32/install.sh b/travis/mingw32/install.sh index e4fcfe72..d38f289f 100755 --- a/travis/mingw32/install.sh +++ b/travis/mingw32/install.sh @@ -13,7 +13,7 @@ ln -s /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll $HOME/.wine/drive_c/windo # build sqlite3 wget https://sqlite.org/2018/sqlite-autoconf-3250100.tar.gz tar xzf sqlite-autoconf-3250100.tar.gz -(cd sqlite-autoconf-3250100 && CC="ccache x86_64-w64-mingw32-gcc" CXX="ccache x86_64-w64-mingw32-g++" LD=x86_64-w64-mingw32-ld ./configure --host=x86_64-w64-mingw32 --prefix=/usr/x86_64-w64-mingw32 && make -j3 && sudo make install) +(cd sqlite-autoconf-3250100 && CC="ccache x86_64-w64-mingw32-gcc" CXX="ccache x86_64-w64-mingw32-g++" LD=x86_64-w64-mingw32-ld ./configure --host=x86_64-w64-mingw32 --prefix=/usr/x86_64-w64-mingw32 && make -j2 && sudo make install) ln -s /usr/x86_64-w64-mingw32/bin/libsqlite3-0.dll $HOME/.wine/drive_c/windows # prepare build files @@ -22,11 +22,11 @@ ln -s /usr/x86_64-w64-mingw32/bin/libsqlite3-0.dll $HOME/.wine/drive_c/windows mkdir build_autoconf cd build_autoconf CC="ccache x86_64-w64-mingw32-gcc" CXX="ccache x86_64-w64-mingw32-g++" LD=x86_64-w64-mingw32-ld ../configure --host=x86_64-w64-mingw32 --prefix=/tmp/proj_autoconf_install -make -j3 +make -j2 make install make dist-all find /tmp/proj_autoconf_install -(cd test; make -j3) +(cd test; make -j2) test/unit/test_cpp_api.exe cd .. # Now with grids @@ -38,7 +38,7 @@ cd .. mkdir build_autoconf_grids cd build_autoconf_grids CC="ccache x86_64-w64-mingw32-gcc" CXX="ccache x86_64-w64-mingw32-g++" LD=x86_64-w64-mingw32-ld ../configure --host=x86_64-w64-mingw32 --prefix=/tmp/proj_autoconf_install_nad -make -j3 +make -j2 make install find /tmp/proj_autoconf_install_nad #make check -- cgit v1.2.3