Merge pull request #5653 from robin2008/xcatperftest

Two changes on xcatperftest

xCAT-test/autotest/perfcmds.lst

@@ -1,5 +1,5 @@
-#SERIES# 1,50,100,250,500,1000,2500,5000,10000
-lsdef #NODES#
+#SERIES# 1,50,100,250,500,1000,2500,5000,10000,20000
+lsdef #NODES# -i ip,mac
 makehosts #NODES#
 makedns -n #NODES#
 makedhcp #NODES#
@@ -10,4 +10,6 @@ nodeset #NODES# osimage=#OSIMAGE#
 chdef -t node -o #NODES# postscripts="fake" profile="install" netboot="grub2"
 rmdef -t node #PERFGRP#
 cat #STANZ#|mkdef -z -f
+lsdef -w 'serial=12345678'
+chdef #NODES# -p groups=group1
 noderm #PERFGRP#

xCAT-test/bin/xcatperftest

@@ -347,7 +347,12 @@ execCmd()
   fi
 
   start=`date +%s%3N`
-  eval "$1" > /dev/null 2>&1
+
+  #using timeout to avoid some commands hang
+  timeout 3600 bash <<EOT
+$1 > /dev/null 2>&1
+EOT
+
   retval=$?
   end=`date +%s%3N`
   delta=$(printf "%.2f" `echo "scale=2;$(($end-$start))/1000"|bc`)