diff --git a/.travis.yml b/.travis.yml index e5dd6d2b..7ea9244e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,5 +22,5 @@ addons: script: - mkdir tests - cd tests -# - ../src/test/tpkg/run-all.sh - - ../src/test/tpkg/run-one.sh 275-server-capabilities.tpkg -V + - ../src/test/tpkg/run-all.sh +# - ../src/test/tpkg/run-one.sh 275-server-capabilities.tpkg -V diff --git a/src/test/tpkg/275-server-capabilities.tpkg/275-server-capabilities.test b/src/test/tpkg/275-server-capabilities.tpkg/275-server-capabilities.test index c3dc69b6..ffc63f50 100644 --- a/src/test/tpkg/275-server-capabilities.tpkg/275-server-capabilities.test +++ b/src/test/tpkg/275-server-capabilities.tpkg/275-server-capabilities.test @@ -5,9 +5,8 @@ [ -f .tpkg.var.test ] && source .tpkg.var.test LOCALHOST=`${GETDNS_STUB_QUERY} '{namespaces:[GETDNS_NAMESPACE_LOCALNAMES]}' -A localhost. -J \ - | awk -F: '/\"address_data\".*\"127/{print $2}' \ - | sed -e 's/^[^"]*"//g' -e 's/"[^"]*$//g'` \ - | head -1 + | awk -F: '/\"address_data\".*\"127/{print $2;exit}' \ + | sed -e 's/^[^"]*"//g' -e 's/"[^"]*$//g'` echo "localhost: $LOCALHOST" cmake . && make && valgrind -v --log-file=valgrind.log --leak-check=full --error-exitcode=1 --track-origins=yes "./${TPKG_NAME}" ${LOCALHOST} | ( diff --git a/src/test/tpkg/280-limit_outstanding_queries.tpkg/280-limit_outstanding_queries.test b/src/test/tpkg/280-limit_outstanding_queries.tpkg/280-limit_outstanding_queries.test index 82c6affe..548bb0fa 100644 --- a/src/test/tpkg/280-limit_outstanding_queries.tpkg/280-limit_outstanding_queries.test +++ b/src/test/tpkg/280-limit_outstanding_queries.tpkg/280-limit_outstanding_queries.test @@ -6,7 +6,7 @@ LOCALHOST=`${GETDNS_STUB_QUERY} '{namespaces:[GETDNS_NAMESPACE_LOCALNAMES]}' -A localhost. -J \ - | awk -F: '/\"address_data\".*\"127/{print $2}' \ + | awk -F: '/\"address_data\".*\"127/{print $2;exit}' \ | sed -e 's/^[^"]*"//g' -e 's/"[^"]*$//g'` echo "localhost: $LOCALHOST" diff --git a/src/test/tpkg/285-out_of_filedescriptors.tpkg/285-out_of_filedescriptors.test b/src/test/tpkg/285-out_of_filedescriptors.tpkg/285-out_of_filedescriptors.test index 09410e7d..a69e6dfa 100644 --- a/src/test/tpkg/285-out_of_filedescriptors.tpkg/285-out_of_filedescriptors.test +++ b/src/test/tpkg/285-out_of_filedescriptors.tpkg/285-out_of_filedescriptors.test @@ -6,7 +6,7 @@ LOCALHOST=`${GETDNS_STUB_QUERY} '{namespaces:[GETDNS_NAMESPACE_LOCALNAMES]}' -A localhost. -J \ - | awk -F: '/\"address_data\".*\"127/{print $2}' \ + | awk -F: '/\"address_data\".*\"127/{print $2;exit}' \ | sed -e 's/^[^"]*"//g' -e 's/"[^"]*$//g'` echo "localhost: $LOCALHOST"