Don't include temp testdir on each log line

This was mostly an artifact to tell which log lines belong to which test
from the time when the test output could be all mingled together. Now
this info is reduntant, because the pytest logger already includes both
the system test name, and the specific test.

diff --git a/bin/tests/system/conf.sh.common b/bin/tests/system/conf.sh.common
index cdf26d317e6ce06d813720fb2cdd2aa5097d4a37..a33fe46570537760f84637f180e38f2106577212 100644 (file)
--- a/bin/tests/system/conf.sh.common
+++ b/bin/tests/system/conf.sh.common
@@ -69,19 +69,19 @@ then
        }
        echo_i() {
            printf '%s\n' "$*" | while IFS= read -r __LINE ; do
-              echoinfo "I:$SYSTESTDIR:$__LINE"
+              echoinfo "I:$__LINE"
            done
        }
 
        echo_ic() {
            printf '%s\n' "$*" | while IFS= read -r __LINE ; do
-              echoinfo "I:$SYSTESTDIR:  $__LINE"
+              echoinfo "I:  $__LINE"
            done
        }
 
        echo_d() {
            printf '%s\n' "$*" | while IFS= read -r __LINE ; do
-              echoinfo "D:$SYSTESTDIR:$__LINE"
+              echoinfo "D:$__LINE"
            done
        }
 else
@@ -106,32 +106,32 @@ else
 
        echo_i() {
            echo "$@" | while IFS= read -r __LINE ; do
-              echoinfo "I:$SYSTESTDIR:$__LINE"
+              echoinfo "I:$__LINE"
            done
        }
 
        echo_ic() {
            echo "$@" | while IFS= read -r __LINE ; do
-              echoinfo "I:$SYSTESTDIR:  $__LINE"
+              echoinfo "I:  $__LINE"
            done
        }
 
        echo_d() {
            echo "$@" | while IFS= read -r __LINE ; do
-              echoinfo "D:$SYSTESTDIR:$__LINE"
+              echoinfo "D:$__LINE"
            done
        }
 fi
 
 cat_i() {
     while IFS= read -r __LINE ; do
-       echoinfo "I:$SYSTESTDIR:$__LINE"
+       echoinfo "I:$__LINE"
     done
 }
 
 cat_d() {
     while IFS= read -r __LINE ; do
-       echoinfo "D:$SYSTESTDIR:$__LINE"
+       echoinfo "D:$__LINE"
     done
 }
 
@@ -499,7 +499,7 @@ _times() {
 }
 
 rndc_reload() {
-    $RNDC -c ../_common/rndc.conf -s $2 -p ${CONTROLPORT} reload $3 2>&1 | sed 's/^/'"I:$SYSTESTDIR:$1"' /'
+    $RNDC -c ../_common/rndc.conf -s $2 -p ${CONTROLPORT} reload $3 2>&1 | sed 's/^/'"I:$1"' /'
     # reloading single zone is synchronous, if we're reloading whole server
     # we need to wait for reload to finish
     if [ -z "$3" ]; then
@@ -512,7 +512,7 @@ rndc_reload() {
 
 rndc_reconfig() {
     seconds=${3:-10}
-    $RNDC -c ../_common/rndc.conf -s "$2" -p "${CONTROLPORT}" reconfig 2>&1 | sed 's/^/'"I:$SYSTESTDIR:$1"' /'
+    $RNDC -c ../_common/rndc.conf -s "$2" -p "${CONTROLPORT}" reconfig 2>&1 | sed 's/^/'"I:$1"' /'
     for _ in $(_times "$seconds"); do
         "$RNDC" -c ../_common/rndc.conf -s "$2" -p "${CONTROLPORT}" status | grep "reload/reconfig in progress" > /dev/null || break
         sleep 1