Now with actual fix for multiple localhost addresses

This commit is contained in:
Willem Toorop 2019-12-16 12:05:29 +01:00
parent aafdba690d
commit 3e373ab2af
4 changed files with 6 additions and 7 deletions

View File

@ -22,5 +22,5 @@ addons:
script: script:
- mkdir tests - mkdir tests
- cd tests - cd tests
# - ../src/test/tpkg/run-all.sh - ../src/test/tpkg/run-all.sh
- ../src/test/tpkg/run-one.sh 275-server-capabilities.tpkg -V # - ../src/test/tpkg/run-one.sh 275-server-capabilities.tpkg -V

View File

@ -5,9 +5,8 @@
[ -f .tpkg.var.test ] && source .tpkg.var.test [ -f .tpkg.var.test ] && source .tpkg.var.test
LOCALHOST=`${GETDNS_STUB_QUERY} '{namespaces:[GETDNS_NAMESPACE_LOCALNAMES]}' -A localhost. -J \ 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'` \ | sed -e 's/^[^"]*"//g' -e 's/"[^"]*$//g'`
| head -1
echo "localhost: $LOCALHOST" echo "localhost: $LOCALHOST"
cmake . && make && valgrind -v --log-file=valgrind.log --leak-check=full --error-exitcode=1 --track-origins=yes "./${TPKG_NAME}" ${LOCALHOST} | ( cmake . && make && valgrind -v --log-file=valgrind.log --leak-check=full --error-exitcode=1 --track-origins=yes "./${TPKG_NAME}" ${LOCALHOST} | (

View File

@ -6,7 +6,7 @@
LOCALHOST=`${GETDNS_STUB_QUERY} '{namespaces:[GETDNS_NAMESPACE_LOCALNAMES]}' -A localhost. -J \ 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'` | sed -e 's/^[^"]*"//g' -e 's/"[^"]*$//g'`
echo "localhost: $LOCALHOST" echo "localhost: $LOCALHOST"

View File

@ -6,7 +6,7 @@
LOCALHOST=`${GETDNS_STUB_QUERY} '{namespaces:[GETDNS_NAMESPACE_LOCALNAMES]}' -A localhost. -J \ 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'` | sed -e 's/^[^"]*"//g' -e 's/"[^"]*$//g'`
echo "localhost: $LOCALHOST" echo "localhost: $LOCALHOST"