[Fuego] [PATCH 1/2] Functional.pi_tests: fixed a spec error

[Fuego] [PATCH 1/2] Functional.pi_tests: fixed a spec error

[Li Xiaoming]

Details: the old branch name in spec.json does not exist anymore, change it to a new one

Signed-off-by: Li Xiaoming <lixm.fnst@cn.fujitsu.com>
---
 engine/tests/Functional.pi_tests/spec.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/tests/Functional.pi_tests/spec.json b/engine/tests/Functional.pi_tests/spec.json
index 96f51a4..263096d 100644
--- a/engine/tests/Functional.pi_tests/spec.json
+++ b/engine/tests/Functional.pi_tests/spec.json
@@ -16,7 +16,7 @@
         "latest": {
             "PER_JOB_BUILD": "true",
             "gitrepo": "https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git",
-            "gitref": "unstable/devel/v1.1.1",
+            "gitref": "unstable/devel/latest",
             "PARAMS": "--duration=60"
         }
     }
-- 
2.7.4

[Fuego] [PATCH 2/2] Functional.fuse: fixed build error

[Li Xiaoming]

Details: solved 2 problems:
1) copy the missing .so files to board
2) calls fusermount with full path as the default env does not include it

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

diff --git a/engine/tests/Functional.fuse/fuego_test.sh b/engine/tests/Functional.fuse/fuego_test.sh
index 2d6405a..94c4bd2 100755
--- a/engine/tests/Functional.fuse/fuego_test.sh
+++ b/engine/tests/Functional.fuse/fuego_test.sh
@@ -1,4 +1,6 @@
 tarball=fuse-2.9.4.tar.gz
+LIB_FUSE=""
+NEED_ROOT=1
 
 function test_build {
     echo "fuse test build"
@@ -7,16 +9,26 @@ 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 LIB_FUSE /usr/lib
+    if [ -z $LIB_FUSE ]; then
+        put lib/.libs/libfuse.so.2.9.4 /usr/lib/
+        cmd "ln -sf /usr/lib/libfuse.so.2.9.4 /usr/lib/libfuse.so.2"
+    fi
 }
 
 function test_run {
     report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v fuse_test.sh"
+    if [ -z $LIB_FUSE ]; then
+        cmd "rm /usr/lib/libfuse.so.2.9.4 ; rm /usr/lib/libfuse.so.2"
+    fi
 }
 
 function test_processing {
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

Re: [Fuego] [PATCH 1/2] Functional.pi_tests: fixed a spec error

[Tim.Bird]

> -----Original Message-----
> From: Li Xiaoming
> 
> Details: the old branch name in spec.json does not exist anymore, change it
> to a new one
> 
> Signed-off-by: Li Xiaoming <lixm.fnst@cn.fujitsu.com>
> ---
>  engine/tests/Functional.pi_tests/spec.json | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/engine/tests/Functional.pi_tests/spec.json
> b/engine/tests/Functional.pi_tests/spec.json
> index 96f51a4..263096d 100644
> --- a/engine/tests/Functional.pi_tests/spec.json
> +++ b/engine/tests/Functional.pi_tests/spec.json
> @@ -16,7 +16,7 @@
>          "latest": {
>              "PER_JOB_BUILD": "true",
>              "gitrepo": "https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git",
> -            "gitref": "unstable/devel/v1.1.1",
> +            "gitref": "unstable/devel/latest",
>              "PARAMS": "--duration=60"
>          }
>      }
> --
> 2.7.4

Nice catch!  Thanks for the fix.  Tested, applied, and pushed.
 -- Tim

Re: [Fuego] [PATCH 2/2] Functional.fuse: fixed build error

[Tim.Bird]

In testing this patch, I have a few boards that now spin forever
on the "rm -rf $test_path/fuse" operation at the end of the test.

I think before I applied the patch, some previous operation was failing
and the contents of fuego.Functional.fuse/fuse/test_fusexmp were not
valid.  Now, the root filesystem appears to be showing up in the fuse
areas.  Specifically, I have sys, home, and others trying to be deleted
in fuego.Functional.fuse/fuse/test_fusexmp.  Since 'home' is present, it
causes recursion in the directory processing for the 'rm -rf'

I have run out of time to investigate this today, but overall I think I
need to eliminate the 'rm -rf' operation at the end of the test,
or somehow prevent it from recursing.   These errors are making
it difficult to test the fixes performed by the patch.  I'll work on this
more tomorrow and let you know what I see.

Thanks,
 -- Tim


> -----Original Message-----
> From: Li Xiaoming
> Sent: Monday, July 30, 2018 8:45 PM
> To: fuego@lists.linuxfoundation.org
> Subject: [Fuego] [PATCH 2/2] Functional.fuse: fixed build error
> 
> Details: solved 2 problems:
> 1) copy the missing .so files to board
> 2) calls fusermount with full path as the default env does not include it
> 
> Signed-off-by: Li Xiaoming <lixm.fnst@cn.fujitsu.com>
> ---
>  engine/tests/Functional.fuse/fuego_test.sh | 12 ++++++++++++
>  engine/tests/Functional.fuse/fuse_test.sh  |  8 ++++----
>  2 files changed, 16 insertions(+), 4 deletions(-)
> 
> diff --git a/engine/tests/Functional.fuse/fuego_test.sh
> b/engine/tests/Functional.fuse/fuego_test.sh
> index 2d6405a..94c4bd2 100755
> --- a/engine/tests/Functional.fuse/fuego_test.sh
> +++ b/engine/tests/Functional.fuse/fuego_test.sh
> @@ -1,4 +1,6 @@
>  tarball=fuse-2.9.4.tar.gz
> +LIB_FUSE=""
> +NEED_ROOT=1
> 
>  function test_build {
>      echo "fuse test build"
> @@ -7,16 +9,26 @@ 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 LIB_FUSE /usr/lib
> +    if [ -z $LIB_FUSE ]; then
> +        put lib/.libs/libfuse.so.2.9.4 /usr/lib/
> +        cmd "ln -sf /usr/lib/libfuse.so.2.9.4 /usr/lib/libfuse.so.2"
> +    fi
>  }
> 
>  function test_run {
>      report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v fuse_test.sh"
> +    if [ -z $LIB_FUSE ]; then
> +        cmd "rm /usr/lib/libfuse.so.2.9.4 ; rm /usr/lib/libfuse.so.2"
> +    fi
>  }
> 
>  function test_processing {
> 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
> 
> 
> 
> _______________________________________________
> Fuego mailing list
> Fuego@lists.linuxfoundation.org
> https://lists.linuxfoundation.org/mailman/listinfo/fuego