1 files changed, 19 insertions, 5 deletions

diff --git a/meta/recipes-support/numactl/numactl/run-ptest b/meta/recipes-support/numactl/numactl/run-ptest
index 215f7c25b9..bf269da755 100755
--- a/meta/recipes-support/numactl/numactl/run-ptest
+++ b/meta/recipes-support/numactl/numactl/run-ptest
@@ -1,9 +1,23 @@
 #!/bin/sh
-make regress1
-make regress2
-if  numademo -t -e 10M; then
-        echo "PASS: numademo"
+
+# If there is numa support, run the tests. Otherwise skip all the tests.
+# Ideally the skipping would happen by the upstream tests.
+if ! numactl -s | grep -q "No NUMA support available on this system."; then
+        make regress1
+        make regress2
+        if  numademo -t -e 10M; then
+                echo "PASS: numademo"
+        else
+                echo "FAIL: numademo"
+        fi
 else
-        echo "FAIL: numademo"
+        echo "SKIP: ./../test/bind_range"
+        echo "SKIP: ./../test/checkaffinity"
+        echo "SKIP: ./../test/checktopology"
+        echo "SKIP: ./../test/distance"
+        echo "SKIP: ./../test/nodemap"
+        echo "SKIP: ./../test/tbitmap"
+        echo "SKIP: numactl_regress"
+        echo "SKIP: numademo"
 fi