diff --git a/t_server/original/client_vm/bin/t_client.sh b/t_server/original/client_vm/bin/t_client.sh index a180cda..98b53cc 100755 --- a/t_server/original/client_vm/bin/t_client.sh +++ b/t_server/original/client_vm/bin/t_client.sh @@ -141,6 +141,9 @@ else fi LOGDIR=t_client-`hostname`-`date +%Y%m%d-%H%M%S` +if [ -n "$TEST_RUN_GROUP" ]; then + LOGDIR="${LOGDIR}-${TEST_RUN_GROUP}" +fi LOGDIR_ABS="$PWD/$LOGDIR" if mkdir $LOGDIR then : @@ -240,7 +243,7 @@ get_ifconfig_route() # except Linux and MacOS case $UNAME in Linux) - if [ -x /usr/bin/resolvectl ] ; then + if [ -x /usr/bin/resolvectl -a -d /run/systemd/system ] ; then echo "-- linux resolvectl --" resolvectl status else diff --git a/t_server/original/run_t_clients.sh b/t_server/original/run_t_clients.sh index ddf9756..d5ec1b8 100755 --- a/t_server/original/run_t_clients.sh +++ b/t_server/original/run_t_clients.sh @@ -49,12 +49,18 @@ do grep "Test sets" $LOG | grep -v none >> $SUMMARY case $RC in 0) ;; # all good - 30) EXIT_CODE=1 ;; # some tests failed + 30) # some tests failed + EXIT_CODE=1 + echo "Tests failed in ($T/$G)" + echo "-----------------" + cat $LOG + echo "-----------------" + ;; 77) ;; # no tests run *) # unexpected failure, show more details! echo "Test run $T/$G failed (host=$HOST): rc=$RC" | tee -a $SUMMARY echo "-----------------" - tail $LOG + cat $LOG echo "-----------------" echo "" exit 1