From bbd017f88e24e25ea2a507515d36feb0e60c44ce Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Mon, 14 Sep 2009 19:59:57 +0000
Subject: [PATCH] minor changes for slurm v2.1 and AIX
---
testsuite/expect/test7.7 | 2 +-
testsuite/expect/test7.7.prog.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/testsuite/expect/test7.7 b/testsuite/expect/test7.7
index e54e51c9d8e..af61fd2e644 100755
--- a/testsuite/expect/test7.7
+++ b/testsuite/expect/test7.7
@@ -181,7 +181,7 @@ if {$job_id1 == 0} {
#
set timeout 60
exec $bin_rm -f $test_prog
-exec $bin_make -f /dev/null $test_prog
+exec $bin_cc $test_prog.c -o $test_prog
set success 0
set moab_pid [spawn $test_prog $auth_key $control_addr $e_port $job_id1 $sched_port $is_bluegene]
set master_id $spawn_id
diff --git a/testsuite/expect/test7.7.prog.c b/testsuite/expect/test7.7.prog.c
index 246c2f1e620..28b4c287145 100644
--- a/testsuite/expect/test7.7.prog.c
+++ b/testsuite/expect/test7.7.prog.c
@@ -219,7 +219,7 @@ static int _xmit(char *msg)
static void _event_mgr(void)
{
int accept_fd, event_fd;
- int accept_addr_len = sizeof(struct sockaddr);
+ socklen_t accept_addr_len = sizeof(struct sockaddr);
size_t cnt;
char in_msg[5];
struct sockaddr_in accept_addr;
@@ -497,7 +497,7 @@ int main(int argc, char * argv[])
}
_cancel_job(job_id+1);
_job_requeue(job_id); /* Put job back into HELD state */
- sleep(10);
+ sleep(15);
_start_job(job_id);
_get_jobs();
#endif
--
GitLab