From 290d9b3538f55fe9f5540f30a07fcde4e9e31a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= Date: Sat, 8 Feb 2020 21:29:28 +0100 Subject: [PATCH] fix travis builds --- .travis.yml | 5 ++--- cppignore.lnx | 3 +++ travis/runtests.sh | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index fcaada533..b5b055595 100644 --- a/.travis.yml +++ b/.travis.yml @@ -157,7 +157,7 @@ jobs: - libmysqlclient-dev compiler: gcc script: - - ./configure --everything --omit=PDF && make all -s -j2 && sudo make install + - ./configure --everything --omit=PDF,Redis,MongoDB && make all -s -j2 && sudo make install - sudo -s ./travis/runtests.sh - name: macOS (clang, make) @@ -167,9 +167,8 @@ jobs: homebrew: packages: - openssl - - mysql-client script: - - ./configure --everything --omit=PDF,Data/ODBC,Data/PostgreSQL && make all -s -j2 && sudo make install + - ./configure --everything --no-prefix --omit=PDF,Data/MySQL,Data/ODBC,Data/PostgreSQL && make all -s -j2 && sudo make install - sudo -s ./travis/runtests.sh - name: Linux (gcc, cmake) diff --git a/cppignore.lnx b/cppignore.lnx index 95244721e..2e48a8016 100644 --- a/cppignore.lnx +++ b/cppignore.lnx @@ -15,3 +15,6 @@ N7CppUnit10TestCallerI15FileChannelTestEE.testPurgeAge N7CppUnit10TestCallerI8FileTestEE.testFileAttributes2 N7CppUnit10TestCallerI14ICMPSocketTestEE.testSendToReceiveFrom N7CppUnit10TestCallerI22HTTPSClientSessionTestEE.testCachedSession +N7CppUnit10TestCallerI17SocketAddressTestEE.testSocketAddress +N7CppUnit10TestCallerI7DNSTestEE.testHostByName +N7CppUnit10TestCallerI7DNSTestEE.testHostByAddress diff --git a/travis/runtests.sh b/travis/runtests.sh index 2e2c08dfb..f607c2384 100755 --- a/travis/runtests.sh +++ b/travis/runtests.sh @@ -2,7 +2,8 @@ set -ev osname=`uname` osarch=`uname -m` export POCO_BASE=`pwd` -export EXCLUDE_TESTS="Data/MySQL Data/ODBC MongoDB PDF" +export EXCLUDE_TESTS="Data/MySQL Data/ODBC Data/PostgreSQL MongoDB PDF" export PATH=$PATH:. export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.:$POCO_BASE/lib/$osname/$osarch +export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:.:$POCO_BASE/lib/$osname/$osarch build/script/runtests.sh