From 1bec00a29b54e5b38e5ea52cea4f5396113b27e3 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Thu, 14 Oct 2010 17:23:01 +0000
Subject: [PATCH] Tweak checkpoint/blcr and test11.5 to operate properly
together
---
src/plugins/checkpoint/blcr/checkpoint_blcr.c | 4 ++--
testsuite/expect/test11.5 | 7 ++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/plugins/checkpoint/blcr/checkpoint_blcr.c b/src/plugins/checkpoint/blcr/checkpoint_blcr.c
index 575df897f9d..b1e1ca367d9 100644
--- a/src/plugins/checkpoint/blcr/checkpoint_blcr.c
+++ b/src/plugins/checkpoint/blcr/checkpoint_blcr.c
@@ -312,7 +312,7 @@ extern int slurm_ckpt_comp ( struct step_record * step_ptr, time_t event_time,
uint32_t error_code, char *error_msg )
{
error("checkpoint/blcr: slurm_ckpt_comp not implemented");
- return SLURM_FAILURE;
+ return ESLURM_NOT_SUPPORTED;
}
extern int slurm_ckpt_task_comp ( struct step_record * step_ptr,
@@ -320,7 +320,7 @@ extern int slurm_ckpt_task_comp ( struct step_record * step_ptr,
uint32_t error_code, char *error_msg )
{
error("checkpoint/blcr: slurm_ckpt_task_comp not implemented");
- return SLURM_FAILURE;
+ return ESLURM_NOT_SUPPORTED;
}
extern int slurm_ckpt_alloc_job(check_jobinfo_t *jobinfo)
diff --git a/testsuite/expect/test11.5 b/testsuite/expect/test11.5
index 62b6b0589f8..14f80b2bc4e 100755
--- a/testsuite/expect/test11.5
+++ b/testsuite/expect/test11.5
@@ -180,7 +180,7 @@ expect {
set matches 0
spawn $scontrol check able $job_id.0
expect {
- -re "Began at" {
+ -re "(Yes|Began at)" {
incr matches
exp_continue
}
@@ -221,6 +221,11 @@ expect {
incr matches
exp_continue
}
+ -re "Job step not running" {
+ send_user "\nNot a problem if the checkpoint completed\n"
+ incr matches
+ exp_continue
+ }
-re "Requested operation not supported on this system" {
incr matches
exp_continue
--
GitLab