From d65e71dae285322666556f07e598c6f021febfab Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Thu, 13 May 2004 17:08:35 +0000
Subject: [PATCH] Assorted mods for v0.3.
---
testsuite/slurm_unit/api/Makefile.am | 1 -
testsuite/slurm_unit/api/manual/job_info-tst.c | 2 +-
testsuite/slurm_unit/api/manual/node_info-tst.c | 2 +-
testsuite/slurm_unit/api/manual/partition_info-tst.c | 4 ++--
testsuite/slurm_unit/common/Makefile.am | 5 ++++-
testsuite/slurm_unit/common/bitstring-test.c | 3 +--
testsuite/slurm_unit/common/runqsw.c | 8 +++-----
7 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/testsuite/slurm_unit/api/Makefile.am b/testsuite/slurm_unit/api/Makefile.am
index d67f8f2482f..3914183e0c5 100644
--- a/testsuite/slurm_unit/api/Makefile.am
+++ b/testsuite/slurm_unit/api/Makefile.am
@@ -10,5 +10,4 @@ TESTS = \
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
LDADD = $(top_builddir)/src/common/libcommon.la \
- $(top_builddir)/src/common/libhostlist.la \
$(top_builddir)/src/api/libslurm.la
diff --git a/testsuite/slurm_unit/api/manual/job_info-tst.c b/testsuite/slurm_unit/api/manual/job_info-tst.c
index 409e6fa1fb8..7a84a5587fc 100644
--- a/testsuite/slurm_unit/api/manual/job_info-tst.c
+++ b/testsuite/slurm_unit/api/manual/job_info-tst.c
@@ -14,7 +14,7 @@ main (int argc, char *argv[])
int error_code;
job_info_msg_t * job_info_msg_ptr = NULL;
- error_code = slurm_load_jobs (last_update_time, &job_info_msg_ptr);
+ error_code = slurm_load_jobs (last_update_time, &job_info_msg_ptr, 1);
if (error_code) {
slurm_perror ("slurm_load_jobs");
return (error_code);
diff --git a/testsuite/slurm_unit/api/manual/node_info-tst.c b/testsuite/slurm_unit/api/manual/node_info-tst.c
index 9802811b8ea..950f85539b8 100644
--- a/testsuite/slurm_unit/api/manual/node_info-tst.c
+++ b/testsuite/slurm_unit/api/manual/node_info-tst.c
@@ -14,7 +14,7 @@ main (int argc, char *argv[])
int error_code, i;
node_info_msg_t * node_info_msg_ptr = NULL;
- error_code = slurm_load_node (last_update_time, &node_info_msg_ptr);
+ error_code = slurm_load_node (last_update_time, &node_info_msg_ptr, 1);
if (error_code) {
slurm_perror ("last_update_time");
return (error_code);
diff --git a/testsuite/slurm_unit/api/manual/partition_info-tst.c b/testsuite/slurm_unit/api/manual/partition_info-tst.c
index 2507ee032ce..e11bfbaeaf8 100644
--- a/testsuite/slurm_unit/api/manual/partition_info-tst.c
+++ b/testsuite/slurm_unit/api/manual/partition_info-tst.c
@@ -14,7 +14,7 @@ main (int argc, char *argv[])
int error_code ;
partition_info_msg_t * part_info_ptr = NULL;
- error_code = slurm_load_partitions (last_update_time, &part_info_ptr);
+ error_code = slurm_load_partitions (last_update_time, &part_info_ptr, 1);
if (error_code) {
slurm_perror ("slurm_load_partitions");
return (error_code);
@@ -24,7 +24,7 @@ main (int argc, char *argv[])
(time_t) part_info_ptr->last_update,
part_info_ptr->record_count);
- slurm_print_partition_info_msg ( stdout, part_info_ptr, 0 );
+ slurm_print_partition_info_msg (stdout, part_info_ptr, 0);
slurm_free_partition_info_msg (part_info_ptr);
return (0);
}
diff --git a/testsuite/slurm_unit/common/Makefile.am b/testsuite/slurm_unit/common/Makefile.am
index 33ae8950a66..842449a3fbc 100644
--- a/testsuite/slurm_unit/common/Makefile.am
+++ b/testsuite/slurm_unit/common/Makefile.am
@@ -2,12 +2,15 @@ AUTOMAKE_OPTIONS = foreign
if HAVE_ELAN
elan_testprogs = runqsw
+elan_lib = $(top_builddir)/src/plugins/switch/elan/switch_elan.la
else
elan_testprogs =
+elan_lib =
endif
INCLUDES = -I$(top_srcdir)
-LDADD = $(top_builddir)/src/common/libcommon.la
+LDADD = $(top_builddir)/src/common/libcommon.la \
+ $(elan_lib)
check_PROGRAMS = \
$(TESTS) \
diff --git a/testsuite/slurm_unit/common/bitstring-test.c b/testsuite/slurm_unit/common/bitstring-test.c
index d2d5ce56820..03f83de8287 100644
--- a/testsuite/slurm_unit/common/bitstring-test.c
+++ b/testsuite/slurm_unit/common/bitstring-test.c
@@ -5,7 +5,6 @@
#include <sys/time.h>
#include <testsuite/dejagnu.h>
-
/* Test for failure:
*/
#define TEST(_tst, _msg) do { \
@@ -97,7 +96,7 @@ main(int argc, char *argv[])
bit_not(bs1);
TEST(!bit_test(bs1, 100), "not");
- TEST(!bit_test(bs1, 12), "not");
+ TEST(bit_test(bs1, 12), "not");
bit_free(bs1);
bit_free(bs2);
diff --git a/testsuite/slurm_unit/common/runqsw.c b/testsuite/slurm_unit/common/runqsw.c
index 9813e7be38f..b36b21e01cd 100644
--- a/testsuite/slurm_unit/common/runqsw.c
+++ b/testsuite/slurm_unit/common/runqsw.c
@@ -15,11 +15,9 @@
#include <string.h>
#include <stdarg.h>
-#include <src/common/bitstring.h>
-#include <src/common/pack.h>
-#include <src/common/qsw.h>
-#include <slurm/slurm_errno.h>
-#include <src/common/macros.h>
+#include "src/plugins/switch/elan/qsw.h"
+#include "slurm/slurm_errno.h"
+#include "src/common/slurm_xlator.h"
/* Boolean option to pack/unpack jobinfo struct
* (good test for qsw pack routines)
--
GitLab