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");