Tweak some "make check" tests for proper operation in SLURM v2.2

testsuite/slurm_unit/api/manual/submit-tst.c

@@ -46,9 +46,9 @@ main (int argc, char *argv[])
 	slurm_init_job_desc_msg( &job_mesg );
 	job_mesg. contiguous = 1; 
 	job_mesg. name = ("job01");
-	job_mesg. num_procs = 1;
-	job_mesg. job_min_memory = 100;
-	job_mesg. job_min_tmp_disk = 200;
+	job_mesg. min_cpus = 1;
+	job_mesg. pn_min_memory = 100;
+	job_mesg. pn_min_tmp_disk = 200;
 	job_mesg. priority = 100;
 	job_mesg. shared = 0;
 	job_mesg. time_limit = 100;
@@ -83,9 +83,9 @@ main (int argc, char *argv[])
 		slurm_init_job_desc_msg( &job_mesg );
 		job_mesg. contiguous = 1; 
 		job_mesg. name = ("job02+");
-		job_mesg. num_procs = 1;
-		job_mesg. job_min_memory = 100 + i;
-		job_mesg. job_min_tmp_disk = 200 + i;
+		job_mesg. min_cpus = 1;
+		job_mesg. pn_min_memory = 100 + i;
+		job_mesg. pn_min_tmp_disk = 200 + i;
 		job_mesg. priority = 100 + i;
 		job_mesg. script = "/bin/hostname\n";
 		job_mesg. shared = 0;

testsuite/slurm_unit/common/bitstring-test.c

@@ -7,11 +7,11 @@
 
 /* Test for failure: 
 */
-#define TEST(_tst, _msg) do {			\
-	if (! (_tst))				\
-		fail( _msg );       \
-	else					\
-		pass( _msg );       \
+#define TEST(_tst, _msg) do {		\
+	if (! (_tst))			\
+		fail( _msg );		\
+	else				\
+		pass( _msg );		\
 } while (0)
 
 
@@ -150,10 +150,10 @@ main(int argc, char *argv[])
 		bit_set(bs,42);
 		TEST(!strcmp(bit_fmt(tmpstr,sizeof(tmpstr),bs), "42"), "bitstring");
 		bit_set(bs,102);
-		TEST(!strcmp(bit_fmt(tmpstr,sizeof(tmpstr),bs), "[42,102]"), "bitstring");
+		TEST(!strcmp(bit_fmt(tmpstr,sizeof(tmpstr),bs), "42,102"), "bitstring");
 		bit_nset(bs,9,14);
 		TEST(!strcmp(bit_fmt(tmpstr,sizeof(tmpstr), bs), 
-					"[9-14,42,102]"), "bitstring");
+					"9-14,42,102"), "bitstring");
 	}
 
 	note("Testing bit_nffc/bit_nffs");
@@ -196,6 +196,6 @@ main(int argc, char *argv[])
 		TEST(bit_equal(bs, bs2), "bitstring");
 	}
 
-	note("Testing complete!");
-	exit(0);
+	totals();
+	return failed;
 }

testsuite/slurm_unit/common/log-test.c

@@ -44,7 +44,7 @@ int main(int ac, char **av)
 
 	switch (fork()) {
           case 0:
-		  info("in child %ld", getpid());
+		  info("in child %ld", (long int) getpid());
 		  log_reinit();
 		  info("in child after log reinit");
 		  exit(0);
@@ -53,7 +53,7 @@ int main(int ac, char **av)
 		  error("fork: %m");
 		  break;
 	  default:
-		  info("in parent %ld", getpid());
+		  info("in parent %ld", (long int) getpid());
 		  break;
 	}
 	/* for now, this test passes if we make it through without