From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 17 Jun 2008 15:21:48 +0000 (+0000)
Subject: busy porting tests.
X-Git-Tag: release-1.0.1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4cfee1f00b1453c57907cbbec39684897f97d0b;p=thirdparty%2Funbound.git

busy porting tests.

git-svn-id: file:///svn/unbound/trunk@1125 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/testcode/mini_tpkg.sh b/testcode/mini_tpkg.sh
index 5b376432c..6e89a3986 100755
--- a/testcode/mini_tpkg.sh
+++ b/testcode/mini_tpkg.sh
@@ -56,7 +56,11 @@ dir=$name.$$
 result=result.$name
 done=.done-$name
 success="no"
-shell="bash"
+if test -x "`which bash`"; then
+	shell="bash"
+else
+	shell="sh"
+fi
 
 # check already done
 if test -f .done-$name; then
diff --git a/testcode/testbound.c b/testcode/testbound.c
index 78b14aafb..fcb4ab8cd 100644
--- a/testcode/testbound.c
+++ b/testcode/testbound.c
@@ -127,8 +127,13 @@ setup_config(FILE* in, char* configfile, int* lineno,
 	char line[MAX_LINE_LEN];
 	char* parse;
 	FILE* cfg;
+#ifdef USE_WINSOCK
+	snprintf(configfile, MAX_LINE_LEN, "testbound_cfg_%u.tmp", 
+		(unsigned)getpid());
+#else
 	snprintf(configfile, MAX_LINE_LEN, "/tmp/testbound_cfg_%u.tmp", 
 		(unsigned)getpid());
+#endif
 	add_opts("-c", pass_argc, pass_argv);
 	add_opts(configfile, pass_argc, pass_argv);
 	cfg = fopen(configfile, "w");