From 86638eaef7747f3228d4deeb442092379d32c76b Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Mon, 20 Apr 2020 10:13:33 -0400
Subject: [PATCH] Better diagnostic message from nodeset_runimg testcase

---
 xCAT-test/autotest/testcase/genesis/genesistest.pl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/xCAT-test/autotest/testcase/genesis/genesistest.pl b/xCAT-test/autotest/testcase/genesis/genesistest.pl
index 3efbdc71a..44ab44580 100755
--- a/xCAT-test/autotest/testcase/genesis/genesistest.pl
+++ b/xCAT-test/autotest/testcase/genesis/genesistest.pl
@@ -261,13 +261,15 @@ sub testxdsh {
         $checkstring = "destiny=shell";
         $checkfile   = "/proc/cmdline";
     }
+    my $xdsh_command="xdsh $noderange -t 2 cat $checkfile 2>&1|grep $checkstring";
     if (($value == 1) || ($value == 2) || ($value == 3)) {
-        `xdsh $noderange -t 2 cat $checkfile 2>&1|grep $checkstring `;
+        `$xdsh_command`;
         if ($?) {
-            foreach (1 .. 10) {
+            my @i = (1..10);
+            for (@i) {
                 sleep 300;
-                send_msg(1,"try to run xdsh $noderange to check the results again");
-                `xdsh $noderange -t 2 cat $checkfile 2>&1| grep $checkstring `;
+                send_msg(1,"[$_] Running \"$xdsh_command\" to check the results again");
+                `$xdsh_command`;
                 last if ($? == 0);
             }
         }