From 8beace70364756a17020bffbed12869eac7cc142 Mon Sep 17 00:00:00 2001
From: Sara Dickinson <sara@sinodun.com>
Date: Sat, 15 Aug 2015 14:36:36 +0100
Subject: [PATCH] Fix location in manual test script. Add build/ to .gitignore

---
 .gitignore                                  | 1 +
 {build/src => src}/test/tests_transports.sh | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 rename {build/src => src}/test/tests_transports.sh (92%)

diff --git a/.gitignore b/.gitignore
index 4d7a5351..baf73b4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@ m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
 src/config.h.in
+build/
diff --git a/build/src/test/tests_transports.sh b/src/test/tests_transports.sh
similarity index 92%
rename from build/src/test/tests_transports.sh
rename to src/test/tests_transports.sh
index 4ed780bd..a3c18681 100755
--- a/build/src/test/tests_transports.sh
+++ b/src/test/tests_transports.sh
@@ -50,15 +50,20 @@ usage () {
 	echo "local or known test servers are used, but it should work with the default servers:"
 	echo " - Google Open DNS for TCP and UDP only "
 	echo  "- the getdnsapi.net test server Open Resolver for TLS, STARTTLS, TCP and UDP"
+	echo "NOTE: By default this script assumes it is located in the same directory"
+	echo "as the getdns_query binary. If it is not, then the location of the binary"
+	echo "can be specified via the command line option."
 	echo
 	echo "usage: test_transport.sh"
+	ehco "         -p   path to getdns_query binary"
 	echo "         -s   server configured for only TCP and UDP"
 	echo "         -t   server configured for TLS, STARTTLS, TCP and UDP"
 }
 
-while getopts ":s:t:dh" opt; do
+while getopts ":p:s:t:dh" opt; do
 	case $opt in
 		d ) set -x ;;
+		p ) DIR=$OPTARG ;;
 		s ) SERVER_IP=$OPTARG ; echo "Setting server to $OPTARG" ;;
 		t ) TLS_SERVER_IP=$OPTARG ; echo "Setting TLS server to $OPTARG" ;;
 		h ) usage ; exit ;;