[Fuego] [PATCH 08/10] LTP: add blacklist for test cases

Daniel Sangorrin daniel.sangorrin at toshiba.co.jp
Fri Apr 28 08:28:30 UTC 2017


WARNING: not tested

Signed-off-by: Daniel Sangorrin <daniel.sangorrin at toshiba.co.jp>
---
 engine/overlays/testplans/testplan_docker.json |  1 +
 engine/tests/Functional.LTP/fuego_test.sh      | 23 +++++++++++++++--------
 engine/tests/Functional.LTP/spec               |  5 +++++
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/engine/overlays/testplans/testplan_docker.json b/engine/overlays/testplans/testplan_docker.json
index 6336d36..bc9f6d9 100644
--- a/engine/overlays/testplans/testplan_docker.json
+++ b/engine/overlays/testplans/testplan_docker.json
@@ -53,6 +53,7 @@
         },
         {
             "testName": "Functional.LTP",
+            "spec": "docker",
             "timeout": "100m"
         },
         {
diff --git a/engine/tests/Functional.LTP/fuego_test.sh b/engine/tests/Functional.LTP/fuego_test.sh
index c6c50dc..d6428fd 100755
--- a/engine/tests/Functional.LTP/fuego_test.sh
+++ b/engine/tests/Functional.LTP/fuego_test.sh
@@ -90,6 +90,21 @@ function test_build {
         cp --parents testcases/realtime/scripts/setenv.sh `pwd`/target_bin/
         cp $TEST_HOME/ltp_target_run.sh `pwd`/target_bin/
 
+        # 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")}')
+        if [ $cp_syscalls -eq 0 ]; then
+            echo "Removing syscalls binaries"
+            awk '/^[^#]/ { print "rm -f target_bin/testcases/bin/" $2 }' target_bin/runtest/syscalls | sh
+        fi
+
+        # blacklists format: "syscalls:kill10"
+        if [ ! -z ${FUNCTIONAL_LTP_BLACKLIST+x} ]; then
+            for item in $FUNCTIONAL_LTP_BLACKLIST; do
+                test_set=$(echo $item | cut -f1 -d:)
+                test_case=$(echo $item | cut -f2 -d:)
+                sed -e 's/^'"$test_case"'/# '"$test_case"'/' -i target_bin/runtest/$test_set
+            done
+        fi
     else
         echo "Skipping LTP build"
     fi
@@ -98,14 +113,6 @@ function test_build {
 function test_deploy {
     if [ "$FUNCTIONAL_LTP_RUNONLY" = "false" ]; then
         echo "Deploying 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")}')
-        if [ $cp_syscalls -eq 0 ]; then
-            echo "Removing syscalls binaries"
-            awk '/^[^#]/ { print "rm -f target_bin/testcases/bin/" $2 }' target_bin/runtest/syscalls | sh
-        fi
-
         if [ "$FUNCTIONAL_LTP_BUILDONLY" = "true" ]; then
             echo "Creating LTP binary tarball"
             mv target_bin ltp
diff --git a/engine/tests/Functional.LTP/spec b/engine/tests/Functional.LTP/spec
index cdbb0f4..38b5479 100644
--- a/engine/tests/Functional.LTP/spec
+++ b/engine/tests/Functional.LTP/spec
@@ -6,6 +6,11 @@
             "tests": "syscalls SEM",
             "extra_success_links": {"xlsx": "results.xlsx"}
         },
+        "docker": {
+            "tests": "syscalls",
+            "blacklist": "syscalls:kill10",
+            "extra_success_links": {"xlsx": "results.xlsx"}
+        },
         "selection": {
             "tests": "syscalls fs pipes sched timers dio mm ipc pty AIO MSG SEM SIG THR TMR TPS",
             "extra_success_links": {"xlsx": "results.xlsx"}
-- 
2.7.4




More information about the Fuego mailing list