[Fuego] [PATCH 4/6] Functional.fuse: fixed with no lib

Li Xiaoming lixm.fnst at cn.fujitsu.com
Mon Jul 16 10:41:45 UTC 2018


Signed-off-by: Li Xiaoming <lixm.fnst at cn.fujitsu.com>
---
 engine/tests/Functional.fuse/fuego_test.sh | 7 +++++++
 engine/tests/Functional.fuse/fuse_test.sh  | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/engine/tests/Functional.fuse/fuego_test.sh b/engine/tests/Functional.fuse/fuego_test.sh
index 2d6405a..9c73b96 100755
--- a/engine/tests/Functional.fuse/fuego_test.sh
+++ b/engine/tests/Functional.fuse/fuego_test.sh
@@ -7,12 +7,19 @@ function test_build {
     patch -p1 -N < $TEST_HOME/patch_files/gold-unversioned-symbol.patch
     ./configure --host=$PREFIX
     make
+    cp util/fusermount  example/.libs
     tar cjf fuse_test_libs.tar.bz2 example/.libs
 }
 
 function test_deploy {
     put fuse_test_libs.tar.bz2 $BOARD_TESTDIR/fuego.$TESTDIR/;
     put $TEST_HOME/fuse_test.sh $BOARD_TESTDIR/fuego.$TESTDIR/;
+
+    is_on_target libfuse.so.2 LIBFUSE_LIB /usr/lib
+    if [ -z $LIBFUSE_LIB ]; then
+        put lib/.libs/libfuse.so.2.9.4 /usr/lib/
+        report "ln -sf /usr/lib/libfuse.so.2.9.4 /usr/lib/libfuse.so.2"
+    fi
 }
 
 function test_run {
diff --git a/engine/tests/Functional.fuse/fuse_test.sh b/engine/tests/Functional.fuse/fuse_test.sh
index 250b642..ab59d45 100755
--- a/engine/tests/Functional.fuse/fuse_test.sh
+++ b/engine/tests/Functional.fuse/fuse_test.sh
@@ -11,7 +11,7 @@ fi;
 if cat $test_path/fuse/test_hello/hello | grep "Hello World!"; then
     echo 'TEST-2 OK'; else echo 'TEST-2 FAIL';
 fi;
-if fusermount -u $test_path/fuse/test_hello; then
+if ./fusermount -u $test_path/fuse/test_hello; then
     echo 'TEST-3 OK'; else echo 'TEST-3 FAIL';
 fi;
 
@@ -21,7 +21,7 @@ if ./fioc -o allow_other -o sync_read -o nonempty \
     -o kernel_cache $test_path/fuse/test_fioc; then
     echo 'TEST-4 OK'; else echo 'TEST-4 FAIL';
 fi;
-if fusermount -u $test_path/fuse/test_fioc/; then
+if ./fusermount -u $test_path/fuse/test_fioc/; then
     echo 'TEST-5 OK'; else echo 'TEST-5 FALL';
 fi;
 
@@ -31,7 +31,7 @@ if ./fsel -o allow_other -o sync_read -o nonempty \
     -o kernel_cache $test_path/fuse/test_fsel; then
     echo 'TEST-6 OK'; else echo 'TEST-6 FAIL';
 fi;
-if fusermount -u $test_path/fuse/test_fsel/; then
+if ./fusermount -u $test_path/fuse/test_fsel/; then
     echo 'TEST-7 OK'; else echo 'TEST-7 FALL';
 fi;
 
@@ -41,7 +41,7 @@ if ./fusexmp -o allow_other -o sync_read -o nonempty \
     $test_path/fuse/test_fusexmp; then
     echo 'TEST-8 OK'; else echo 'TEST-8 FAIL';
 fi;
-if fusermount -u $test_path/fuse/test_fusexmp/; then
+if ./fusermount -u $test_path/fuse/test_fusexmp/; then
     echo 'TEST-9 OK'; else echo 'TEST-9 FALL';
 fi;
 rm -rf $test_path/fuse;
-- 
2.7.4





More information about the Fuego mailing list