From 08bef2a972913556d76daf801204dd470bfdbac7 Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Mon, 21 Sep 2020 12:05:57 -0400 Subject: [PATCH] Improve genesistest script(3) --- .../autotest/testcase/genesis/genesistest.pl | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/xCAT-test/autotest/testcase/genesis/genesistest.pl b/xCAT-test/autotest/testcase/genesis/genesistest.pl index eaec03810..60b5efc27 100755 --- a/xCAT-test/autotest/testcase/genesis/genesistest.pl +++ b/xCAT-test/autotest/testcase/genesis/genesistest.pl @@ -113,11 +113,10 @@ if ($genesis_nodesetshell_test) { #################################### if ($genesis_runcmd_test) { send_msg(2, "[$$]:Running nodeset NODE runcmd test..............."); - my $testxdsh_value = &rungenesiscmd(&get_arch); - if (&testxdsh($testxdsh_value)) { - send_msg(0, "[$$]:Could not verify runcmd test results using xdsh($testxdsh_value) on first attempt, will try again..............."); - if (&testxdsh($testxdsh_value)) { - send_msg(0, "[$$]:Could not verify runcmd test results using xdsh($testxdsh_value) on second attempt, giving up..............."); + if (&testxdsh(&rungenesiscmd(&get_arch))) { + send_msg(0, "[$$]:Could not verify runcmd test results using testxdsh() on first attempt, will try again..............."); + if (&testxdsh(&rungenesiscmd(&get_arch))) { + send_msg(0, "[$$]:Could not verify runcmd test results using testxdsh() on second attempt, giving up..............."); exit 1; } } @@ -128,11 +127,10 @@ if ($genesis_runcmd_test) { ################################## if ($genesis_runimg_test) { send_msg(2, "[$$]:Run nodeset NODE runimage test..............."); - my $testxdsh_value = &rungenesisimg; - if (&testxdsh($testxdsh_value)) { - send_msg(0, "[$$]:Could not verify runimage test results using xdsh($testxdsh_value) on first attmpt, will try again..............."); - if (&testxdsh($testxdsh_value)) { - send_msg(0, "[$$]:Could not verify runimage test results using xdsh($testxdsh_value) on second attempt, giving up..............."); + if (&testxdsh(&rungenesisimg)) { + send_msg(0, "[$$]:Could not verify runimage test results using testxdsh() on first attmpt, will try again..............."); + if (&testxdsh(&rungenesisimg)) { + send_msg(0, "[$$]:Could not verify runimage test results using itestxdsh() on second attempt, giving up..............."); exit 1; } }