[Fuego] [PATCH] ltp: add skiplist to tar file when using maketar

[Fuego] [PATCH] ltp: add skiplist to tar file when using maketar

[Daniel Sangorrin]

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
 engine/tests/Functional.LTP/fuego_test.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/engine/tests/Functional.LTP/fuego_test.sh b/engine/tests/Functional.LTP/fuego_test.sh
index 6fa0bc7..bfa4597 100755
--- a/engine/tests/Functional.LTP/fuego_test.sh
+++ b/engine/tests/Functional.LTP/fuego_test.sh
@@ -324,35 +324,33 @@ function test_deploy {
         done
     fi
 
+    # make a staging area
+    cp -r target_bin ltp
+    cp ${LOGDIR}/skiplist.txt ltp
+
     if [[ "$FUNCTIONAL_LTP_PHASES" == *deploy* ]] && [[ -z "$PROGRAM_RUNLTP" ]] ; then
         echo "Deploying LTP"
-
-        # make a staging area
-        cp -r target_bin ltp
-
         # the syscalls group occupies by far the largest space so remove it if unneeded
         cp_syscalls=$(echo $FUNCTIONAL_LTP_TESTS | awk '{print match($0,"syscalls|quickhit|ltplite|stress.part")}')
         if [ $cp_syscalls -eq 0 ]; then
             echo "Removing syscalls binaries"
             awk '/^[^#]/ { print "rm -f ltp/testcases/bin/" $2 }' ltp/runtest/syscalls | sh
         fi
-
-        cp ${LOGDIR}/skiplist.txt ltp
-
         put ltp/* $LTP_DESTDIR
-        rm -rf ltp
     else
         echo "Skipping LTP deploy to board"
     fi
 
     if [[ "$FUNCTIONAL_LTP_PHASES" == *maketar* ]] ; then
-        cp -r target_bin ltp
         echo "Creating LTP binary tarball"
         tar zcpf ltp.tar.gz ltp/
         mv ltp.tar.gz ${LOGDIR}/
         echo "LTP tar file ltp.tar.gz is available in ${LOGDIR}, for manual deployment"
     fi
 
+    # remove the a staging area
+    rm -rf ltp
+
     # pre-installed LTP needs a few fuego-specific items
     if [ -n "$FUNCTIONAL_LTP_HOMEDIR" ] ; then
        cmd "mkdir -p $FUNCTIONAL_LTP_HOMEDIR/testcases/realtime/scripts"
-- 
2.7.4

Re: [Fuego] [PATCH] ltp: add skiplist to tar file when using maketar

[Tim.Bird]

> -----Original Message-----
> From: Daniel Sangorrin
> 
> Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
> ---
>  engine/tests/Functional.LTP/fuego_test.sh | 16 +++++++---------
>  1 file changed, 7 insertions(+), 9 deletions(-)
> 
> diff --git a/engine/tests/Functional.LTP/fuego_test.sh
> b/engine/tests/Functional.LTP/fuego_test.sh
> index 6fa0bc7..bfa4597 100755
> --- a/engine/tests/Functional.LTP/fuego_test.sh
> +++ b/engine/tests/Functional.LTP/fuego_test.sh
> @@ -324,35 +324,33 @@ function test_deploy {
>          done
>      fi
> 
> +    # make a staging area
> +    cp -r target_bin ltp
> +    cp ${LOGDIR}/skiplist.txt ltp
> +
>      if [[ "$FUNCTIONAL_LTP_PHASES" == *deploy* ]] && [[ -z
> "$PROGRAM_RUNLTP" ]] ; then
>          echo "Deploying LTP"
> -
> -        # make a staging area
> -        cp -r target_bin ltp
> -
>          # the syscalls group occupies by far the largest space so remove it if
> unneeded
>          cp_syscalls=$(echo $FUNCTIONAL_LTP_TESTS | awk '{print
> match($0,"syscalls|quickhit|ltplite|stress.part")}')
>          if [ $cp_syscalls -eq 0 ]; then
>              echo "Removing syscalls binaries"
>              awk '/^[^#]/ { print "rm -f ltp/testcases/bin/" $2 }' ltp/runtest/syscalls
> | sh
>          fi
> -
> -        cp ${LOGDIR}/skiplist.txt ltp
> -
>          put ltp/* $LTP_DESTDIR
> -        rm -rf ltp
>      else
>          echo "Skipping LTP deploy to board"
>      fi
> 
>      if [[ "$FUNCTIONAL_LTP_PHASES" == *maketar* ]] ; then
> -        cp -r target_bin ltp
>          echo "Creating LTP binary tarball"
>          tar zcpf ltp.tar.gz ltp/
>          mv ltp.tar.gz ${LOGDIR}/
>          echo "LTP tar file ltp.tar.gz is available in ${LOGDIR}, for manual
> deployment"
>      fi
> 
> +    # remove the a staging area

I removed the 'a' here.

> +    rm -rf ltp
> +
>      # pre-installed LTP needs a few fuego-specific items
>      if [ -n "$FUNCTIONAL_LTP_HOMEDIR" ] ; then
>         cmd "mkdir -p $FUNCTIONAL_LTP_HOMEDIR/testcases/realtime/scripts"
> --
> 2.7.4

Looks good.  Applied.

Thanks,
 -- Tim