From 4097b7f8456a5d8efd65a0b6ddc3a6f0087bc787 Mon Sep 17 00:00:00 2001 From: huweihua Date: Tue, 2 Dec 2014 03:16:24 -0500 Subject: [PATCH] do some enhancement --- .../testcase/installation/reg_linux_SN_installation_hierarchy | 2 +- .../installation/reg_linux_statelite_installation_flat | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_SN_installation_hierarchy b/xCAT-test/autotest/testcase/installation/reg_linux_SN_installation_hierarchy index 1ff73ca68..907310057 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_SN_installation_hierarchy +++ b/xCAT-test/autotest/testcase/installation/reg_linux_SN_installation_hierarchy @@ -90,5 +90,5 @@ check:rc==0 check:output=~/tftpboot on /tftpboot cmd:xdsh $$SN "nslookup $$CN" check:rc==0 -check:output=~Name: $$CN +check:output=~Name: $$CN end diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat index 0b6c4f7ce..4ad87159a 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat @@ -79,7 +79,7 @@ check:rc==0 check:output=~\d\d:\d\d:\d\d cmd:xdsh $$CN mount check:rc==0 -check:output=~$$MN:/nodedata/$$CN on /.statelite/persistent +check:output=~/nodedata/$$CN on /.statelite/persistent check:output=~compute/rootimg on / type nfs cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir ]; then rm -rf $rootimgdir;fi @@ -114,7 +114,7 @@ check:rc==0 check:output=~\d\d:\d\d:\d\d cmd:xdsh $$CN mount check:rc==0 -check:output=~$$MN:/nodedata/$$CN on /.statelite/persistent +check:output=~/nodedata/$$CN on /.statelite/persistent check:output=~rootfs on / type tmpfs cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi