@@ -56,6 +56,10 @@ else

 fi

 srcdir="${srcdir:-.}"

+export t_server_null_logdir=t_server_null-`hostname`-`date +%Y%m%d-%H%M%S`

+

+# Create directory for server and client logs

+mkdir $t_server_null_logdir

 "${srcdir}/t_server_null_server.sh" &

 "${srcdir}/t_server_null_client.sh"

@@ -14,7 +14,7 @@ launch_client() {

         $client_conf \

         --writepid "${pid}" \

         --setenv pid $pid \

-        --log "${log}" &

+        --log "${t_server_null_logdir}/${log}" &

 }

 wait_for_results() {

@@ -44,7 +44,7 @@ get_client_test_result() {

     should_pass=$2

     log="${test_name}.log"

-    grep "Initialization Sequence Completed" "${log}" > /dev/null

+    grep "Initialization Sequence Completed" "${t_server_null_logdir}/${log}" > /dev/null

     exit_code=$?

     if [ $exit_code -eq 0 ] && [ "${should_pass}" = "yes" ]; then

@@ -4,12 +4,11 @@ launch_server() {

     server_name=$1

     server_exec=$2

     server_conf=$3

-    log="${server_name}.log"

+    log="${t_server_null_logdir}/${server_name}.log"

     status="${server_name}.status"

     pid="${server_name}.pid"

     if [ -z "${RUN_SUDO}" ]; then

-        rm -f "${status}" "${log}" "${pid}"

         "${server_exec}" \

          $server_conf \

          --status "${status}" 1 \

@@ -17,7 +16,6 @@ launch_server() {

          --writepid "${pid}" \

          --explicit-exit-notify 3

     else

-        $RUN_SUDO rm -f "${status}" "${log}" "${pid}"

         $RUN_SUDO "${server_exec}" \

                    $server_conf \

                    --status "${status}" 1 \