numactl: skip test case when target platform doesn't have 2 CPU node

when current test platform doesn't have 2 or more CPU node, the test
case would report FAIL, according to numa test script and numademo
code, when return code=77 should be skip test, so using SKIP instead
of FAIL in test script.

Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit fd0a82400d419bce8605a9445db9b20b8ddc01a7)
Signed-off-by: Steve Sakoman <steve@sakoman.com>

diff --git a/meta/recipes-support/numactl/numactl/Fix-the-test-output-format.patch b/meta/recipes-support/numactl/numactl/Fix-the-test-output-format.patch
index 9812ecc8b3ab548905584bd1efd67365cd54410a..a7bc8d322ee41cd3e77c3b7e2cd18c65ec8c0e0f 100644 (file)
--- a/meta/recipes-support/numactl/numactl/Fix-the-test-output-format.patch
+++ b/meta/recipes-support/numactl/numactl/Fix-the-test-output-format.patch
@@ -7,6 +7,7 @@ Upstream-Status: Pending
 
 Signed-off-by: Roy Li <rongqing.li@windriver.com>
 Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
+Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
 ---
  test/regress  |  6 +++---
  test/regress2 | 11 +++++------
@@ -20,7 +21,7 @@ index 2ce1705..d086a47 100755
        if [ $numnodes -lt 2 ] ; then
            echo "need at least two nodes with at least $NEEDPAGES each of"
            echo "free memory for mempolicy regression tests"
-+          echo "FAIL: numa regress"
++          echo "SKIP: numa regress"
            exit 77  # Skip test
        fi
  }

diff --git a/meta/recipes-support/numactl/numactl/run-ptest b/meta/recipes-support/numactl/numactl/run-ptest
index bf269da7559e88b74a1a2af0655b07a10d4ec2bd..e019b0d364ecc546c9f518fb0dfe370267c16077 100755 (executable)
--- a/meta/recipes-support/numactl/numactl/run-ptest
+++ b/meta/recipes-support/numactl/numactl/run-ptest
@@ -8,7 +8,11 @@ if ! numactl -s | grep -q "No NUMA support available on this system."; then
        if  numademo -t -e 10M; then
                echo "PASS: numademo"
        else
-               echo "FAIL: numademo"
+               if [ "$?" = 77 ] ; then
+                       echo "SKIP: numademo"
+               else
+                       echo "FAIL: numademo"
+               fi
        fi
 else
        echo "SKIP: ./../test/bind_range"