From 78f1560c73c14dd6810bf66abd67f43facd55c25 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Thu, 3 Jun 2010 18:28:07 +0000
Subject: [PATCH] gracefully exit test if a node lacks NUMA functions
---
testsuite/expect/test1.90 | 5 +++++
testsuite/expect/test1.90.prog.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/testsuite/expect/test1.90 b/testsuite/expect/test1.90
index d680a367db2..440a6253b40 100755
--- a/testsuite/expect/test1.90
+++ b/testsuite/expect/test1.90
@@ -118,6 +118,11 @@ set full_mask -1
set timeout $max_job_delay
send "$srun -c1 $file_prog\r"
expect {
+ -re "numa support not available" {
+ send "exit\r"
+ send_user "\nWARNING: Unable to test on this system\n"
+ exit 0
+ }
-re "TASK_ID:($number),CPU_MASK:($number),MEM_MASK:($number)" {
set full_mask $expect_out(3,string)
exp_continue
diff --git a/testsuite/expect/test1.90.prog.c b/testsuite/expect/test1.90.prog.c
index f2d7719fe6f..b4abaed1288 100644
--- a/testsuite/expect/test1.90.prog.c
+++ b/testsuite/expect/test1.90.prog.c
@@ -60,7 +60,7 @@ main (int argc, char **argv)
if (numa_available() < 0) {
fprintf(stderr, "ERROR: numa support not available\n");
- exit(1);
+ exit(0);
}
if ((task_str = getenv("SLURM_PROCID")) == NULL) {
--
GitLab