Skip to content
Snippets Groups Projects
Commit 540f7386 authored by tewk's avatar tewk
Browse files

Fixed test scripts to compile

job_script is no longer a member of the job_rec struct
parent 3ee39e2b
No related branches found
No related tags found
No related merge requests found
...@@ -23,6 +23,7 @@ LDADD = $(top_srcdir)/src/common/libcommon.la \ ...@@ -23,6 +23,7 @@ LDADD = $(top_srcdir)/src/common/libcommon.la \
$(top_srcdir)/src/slurmctld/step_mgr.o \ $(top_srcdir)/src/slurmctld/step_mgr.o \
$(top_srcdir)/src/slurmctld/job_mgr.o \ $(top_srcdir)/src/slurmctld/job_mgr.o \
$(top_srcdir)/src/slurmctld/node_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/common/parse_spec.o \
$(top_srcdir)/src/slurmctld/read_config.o \ $(top_srcdir)/src/slurmctld/read_config.o \
$(top_srcdir)/src/api/libslurm.la $(top_srcdir)/src/api/libslurm.la
......
...@@ -41,7 +41,6 @@ main( int argc, char* argv[]) ...@@ -41,7 +41,6 @@ main( int argc, char* argv[])
job_mesg. partition = get_string_resp("string_resp", "batch\0" ); job_mesg. partition = get_string_resp("string_resp", "batch\0" );
job_mesg. priority = get_int_resp( "priority", 100 ); job_mesg. priority = get_int_resp( "priority", 100 );
job_mesg. req_nodes = get_string_resp( "req_nodes", "lx[3000-3003]\0" ); 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. shared = get_int_resp( "shared", 0 );
job_mesg. time_limit = get_int_resp( "time_limit", 200 ); job_mesg. time_limit = get_int_resp( "time_limit", 200 );
job_mesg. num_procs = get_int_resp( "num_procs", 1000) ; job_mesg. num_procs = get_int_resp( "num_procs", 1000) ;
......
...@@ -31,8 +31,6 @@ main (int argc, char *argv[]) ...@@ -31,8 +31,6 @@ main (int argc, char *argv[])
strcpy (job_rec->name, "Name1"); strcpy (job_rec->name, "Name1");
strcpy (job_rec->partition, "batch"); 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_nodes = 1;
job_rec->details->num_procs = 1; job_rec->details->num_procs = 1;
set_job_id (job_rec); set_job_id (job_rec);
...@@ -49,20 +47,12 @@ main (int argc, char *argv[]) ...@@ -49,20 +47,12 @@ main (int argc, char *argv[])
strcpy (job_rec->name, "Name2"); strcpy (job_rec->name, "Name2");
strcpy (job_rec->partition, "debug"); 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_nodes = i;
job_rec->details->num_procs = i; job_rec->details->num_procs = i;
set_job_id (job_rec); set_job_id (job_rec);
set_job_prio (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; error_code = 0;
pack_all_jobs (&dump, &dump_size, &update_time); pack_all_jobs (&dump, &dump_size, &update_time);
if (error_code) if (error_code)
...@@ -76,8 +66,8 @@ main (int argc, char *argv[]) ...@@ -76,8 +66,8 @@ main (int argc, char *argv[])
if (job_rec == NULL) if (job_rec == NULL)
fail("find_job_record error 1"); fail("find_job_record error 1");
else else
pass ("found job %u, script=%s", pass ("found job %u, ",
job_rec->job_id, job_rec->details->job_script); job_rec->job_id );
job_rec = find_job_record (tmp_id); job_rec = find_job_record (tmp_id);
if (job_rec != NULL) if (job_rec != NULL)
......
...@@ -46,7 +46,6 @@ main( int argc, char* argv[]) ...@@ -46,7 +46,6 @@ main( int argc, char* argv[])
job_mesg. partition = "batch\0"; job_mesg. partition = "batch\0";
job_mesg. priority = 100; job_mesg. priority = 100;
job_mesg. req_nodes = "lx[3000-3003]\0"; job_mesg. req_nodes = "lx[3000-3003]\0";
job_mesg. job_script = "/bin/hostname\0";
job_mesg. shared = 0; job_mesg. shared = 0;
job_mesg. time_limit = 200; job_mesg. time_limit = 200;
job_mesg. num_procs = 1000; job_mesg. num_procs = 1000;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment