From 09c3f00851e8091d6ec8ee1104157ee7129117d0 Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Thu, 16 Jul 2009 18:06:02 +0000
Subject: [PATCH] b=19215 i=Robert.Read do_node print HOSTNAME for no_dsh

---
 lustre/tests/test-framework.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 789663d..44141c2 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -1380,7 +1380,12 @@ do_node() {
     fi
 
     if $verbose ; then
-        $myPDSH $HOST "(PATH=\$PATH:$RLUSTRE/utils:$RLUSTRE/tests:/sbin:/usr/sbin; cd $RPWD; sh -c \"$@\")"
+        # print HOSTNAME for myPDSH="no_dsh"
+        if [[ $myPDSH = no_dsh ]]; then
+            $myPDSH $HOST "(PATH=\$PATH:$RLUSTRE/utils:$RLUSTRE/tests:/sbin:/usr/sbin; cd $RPWD; sh -c \"$@\")" | sed -e "s/^/${HOSTNAME}: /"
+        else
+            $myPDSH $HOST "(PATH=\$PATH:$RLUSTRE/utils:$RLUSTRE/tests:/sbin:/usr/sbin; cd $RPWD; sh -c \"$@\")"
+        fi
     else
         $myPDSH $HOST "(PATH=\$PATH:$RLUSTRE/utils:$RLUSTRE/tests:/sbin:/usr/sbin; cd $RPWD; sh -c \"$@\")" | sed "s/^${HOST}: //"
     fi
@@ -1403,8 +1408,7 @@ do_nodes() {
     shift
 
     if $(single_local_node $rnodes); then
-        $verbose && echo -n $rnodes:' ' || true 
-        do_node $rnodes $@
+        do_node --verbose $rnodes $@
         return $?
     fi
 
-- 
1.8.3.1