diff --git a/testsuite/slurm_unit/slurmctld/Makefile.am b/testsuite/slurm_unit/slurmctld/Makefile.am index 38b8e0e5a375d6d82884b30db7a3c34cc579ea95..df7252dcced10fc5103c7a26c7e79d5c778d0119 100644 --- a/testsuite/slurm_unit/slurmctld/Makefile.am +++ b/testsuite/slurm_unit/slurmctld/Makefile.am @@ -23,6 +23,7 @@ LDADD = $(top_srcdir)/src/common/libcommon.la \ $(top_srcdir)/src/slurmctld/step_mgr.o \ $(top_srcdir)/src/slurmctld/job_mgr.o \ $(top_srcdir)/src/slurmctld/node_mgr.o \ + $(top_srcdir)/src/slurmctld/locks.o \ $(top_srcdir)/src/common/parse_spec.o \ $(top_srcdir)/src/slurmctld/read_config.o \ $(top_srcdir)/src/api/libslurm.la diff --git a/testsuite/slurm_unit/slurmctld/job_add.c b/testsuite/slurm_unit/slurmctld/job_add.c index 2b6b2c48e68c54b1ebae2fd4e850d506ccc436fa..4b0542c84937cbc50718036abe28f280349dede1 100644 --- a/testsuite/slurm_unit/slurmctld/job_add.c +++ b/testsuite/slurm_unit/slurmctld/job_add.c @@ -41,7 +41,6 @@ main( int argc, char* argv[]) job_mesg. partition = get_string_resp("string_resp", "batch\0" ); job_mesg. priority = get_int_resp( "priority", 100 ); job_mesg. req_nodes = get_string_resp( "req_nodes", "lx[3000-3003]\0" ); - job_mesg. job_script = get_string_resp( "job_script", "/bin/hostname\0"); job_mesg. shared = get_int_resp( "shared", 0 ); job_mesg. time_limit = get_int_resp( "time_limit", 200 ); job_mesg. num_procs = get_int_resp( "num_procs", 1000) ; diff --git a/testsuite/slurm_unit/slurmctld/job_mgr-test.c b/testsuite/slurm_unit/slurmctld/job_mgr-test.c index 46dd1e97188ae7dbe5deaae3bb7c34a7de937437..def7e9ead5702c8c8c8af40660a637ad4a101b0b 100644 --- a/testsuite/slurm_unit/slurmctld/job_mgr-test.c +++ b/testsuite/slurm_unit/slurmctld/job_mgr-test.c @@ -31,8 +31,6 @@ main (int argc, char *argv[]) strcpy (job_rec->name, "Name1"); strcpy (job_rec->partition, "batch"); - job_rec->details->job_script = xmalloc(20); - strcpy (job_rec->details->job_script, "/bin/hostname"); job_rec->details->num_nodes = 1; job_rec->details->num_procs = 1; set_job_id (job_rec); @@ -49,20 +47,12 @@ main (int argc, char *argv[]) strcpy (job_rec->name, "Name2"); strcpy (job_rec->partition, "debug"); - job_rec->details->job_script = xmalloc(20); - strcpy (job_rec->details->job_script, "/bin/hostname"); job_rec->details->num_nodes = i; job_rec->details->num_procs = i; set_job_id (job_rec); set_job_prio (job_rec); } - //error_code = update_job (tmp_id, update_spec); - if (error_code) { - fail ("update_job"); - } - else pass( "update_job"); - error_code = 0; pack_all_jobs (&dump, &dump_size, &update_time); if (error_code) @@ -76,8 +66,8 @@ main (int argc, char *argv[]) if (job_rec == NULL) fail("find_job_record error 1"); else - pass ("found job %u, script=%s", - job_rec->job_id, job_rec->details->job_script); + pass ("found job %u, ", + job_rec->job_id ); job_rec = find_job_record (tmp_id); if (job_rec != NULL) diff --git a/testsuite/slurm_unit/slurmctld/job_step-test.c b/testsuite/slurm_unit/slurmctld/job_step-test.c index fae00bc58058cd22f64e26e2218addd7d657d2f2..1819ce265d60f228de2ad5e7c79fc3a802eea205 100644 --- a/testsuite/slurm_unit/slurmctld/job_step-test.c +++ b/testsuite/slurm_unit/slurmctld/job_step-test.c @@ -46,7 +46,6 @@ main( int argc, char* argv[]) job_mesg. partition = "batch\0"; job_mesg. priority = 100; job_mesg. req_nodes = "lx[3000-3003]\0"; - job_mesg. job_script = "/bin/hostname\0"; job_mesg. shared = 0; job_mesg. time_limit = 200; job_mesg. num_procs = 1000;