Whamcloud - gitweb
LU-9170 test: fix for hostlist_expand 98/25698/4
authorYang Sheng <yang.sheng@intel.com>
Wed, 1 Mar 2017 17:38:53 +0000 (01:38 +0800)
committerOleg Drokin <oleg.drokin@intel.com>
Sun, 26 Mar 2017 06:50:44 +0000 (06:50 +0000)
Fix string substitution in hostlist_expand. It
may produce a wrong result in some case.

Signed-off-by: Yang Sheng <yang.sheng@intel.com>
Change-Id: Iba33833ec4955dafeeefe5042508a0162c2d477e
Reviewed-on: https://review.whamcloud.com/25698
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/tests/test-framework.sh

index 960bd77..9725fa9 100755 (executable)
@@ -2826,8 +2826,10 @@ hostlist_expand() {
     myList="${list%% *}"
 
     while [[ "$list" != ${myList##* } ]]; do
-        list=${list//${list%% *} /}
-        myList="$myList ${list%% *}"
+       local tlist=" $list"
+       list=${tlist// ${list%% *} / }
+       list=${list:1}
+       myList="$myList ${list%% *}"
     done
     myList="${myList%* }";