[Fuego] [PATCH] busybox: Modify fuego_test.sh and the test of du.

Wang Mingyu wangmy at cn.fujitsu.com
Thu Apr 18 23:39:12 UTC 2019


Signed-off-by: Wang Mingyu <wangmy at cn.fujitsu.com>
---
 tests/Functional.busybox/fuego_test.sh       | 5 ++---
 tests/Functional.busybox/tests/busybox_du.sh | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 tests/Functional.busybox/fuego_test.sh

diff --git a/tests/Functional.busybox/fuego_test.sh b/tests/Functional.busybox/fuego_test.sh
old mode 100755
new mode 100644
index a7aef3e..b866d99
--- a/tests/Functional.busybox/fuego_test.sh
+++ b/tests/Functional.busybox/fuego_test.sh
@@ -47,8 +47,7 @@ function skip_if_in_skiplist {
 }
 
 function test_pre_check {
-    is_on_target_path busybox PROGRAM_BUSYBOX
-    assert_define PROGRAM_BUSYBOX "Missing 'busybox' program on target board"
+    assert_has_program busybox
     echo "Tests skipped depending on the availability of a command on the target"
     touch ${LOGDIR}/skiplist.txt
     skip_if_command_unavailable expect "busybox_ash.sh busybox_passwd.sh"
@@ -79,7 +78,7 @@ function test_run {
         export test_tcpip_host=$SRV_IP; \
         export test_port_host=${SRV_PORT:=8080}; \
         export test_ipaddr=$IPADDR;\
-        sh -v busybox_test.sh"
+        ./busybox_test.sh"
 }
 
 function test_processing {
diff --git a/tests/Functional.busybox/tests/busybox_du.sh b/tests/Functional.busybox/tests/busybox_du.sh
index 4710fb8..0430954 100644
--- a/tests/Functional.busybox/tests/busybox_du.sh
+++ b/tests/Functional.busybox/tests/busybox_du.sh
@@ -8,7 +8,7 @@ test="du"
 mkdir test_dir
 touch ./test_dir/test1
 touch ./test_dir/test2
-if busybox du -k test_dir | grep "4.*test_dir"
+if busybox du -k test_dir | grep ".*test_dir"
 then
     echo " -> $test: TEST-PASS"
 else
-- 
1.8.3.1





More information about the Fuego mailing list