[Fuego] [PATCH] Modify the bashims that may not be supported by board of the test of command chroot.

Wang Mingyu wangmy at cn.fujitsu.com
Fri Jun 15 08:21:26 UTC 2018


Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 engine/tests/Functional.busybox/fuego_test.sh           | 1 +
 engine/tests/Functional.busybox/tests/busybox_chroot.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/engine/tests/Functional.busybox/fuego_test.sh b/engine/tests/Functional.busybox/fuego_test.sh
index 70a6ec1..aa78abf 100755
--- a/engine/tests/Functional.busybox/fuego_test.sh
+++ b/engine/tests/Functional.busybox/fuego_test.sh
@@ -34,6 +34,7 @@ function test_pre_check {
     touch ${LOGDIR}/skiplist.txt
     skip_if_command_unavailable expect "busybox_ash.sh"
     skip_if_command_unavailable tr "busybox_chgrp1.sh busybox_chgrp2.sh busybox_chmod1.sh busybox_chmod2.sh busybox_chown1.sh busybox_chown2.sh"
+    skip_if_command_unavailable expr "busybox_chroot.sh"
 }
 
 function test_deploy {
diff --git a/engine/tests/Functional.busybox/tests/busybox_chroot.sh b/engine/tests/Functional.busybox/tests/busybox_chroot.sh
index fd3c524..6fff60e 100644
--- a/engine/tests/Functional.busybox/tests/busybox_chroot.sh
+++ b/engine/tests/Functional.busybox/tests/busybox_chroot.sh
@@ -14,7 +14,7 @@ mkdir -p $test_dir/lib
 cp -v /bin/ls $test_dir/bin/
 list="$(ldd /bin/ls | egrep -o '/lib.*\.[0-9]')"
 for i in $list; do
-   j=${i:1:5}
+   j=$(expr substr "$i" 2 5)
    if $j = lib64
    then
        echo "lib64"
-- 
1.8.3.1





More information about the Fuego mailing list