From 8b94417ff36e857f007812d9f7765a1f116d7423 Mon Sep 17 00:00:00 2001
From: "Christopher J. Morrone" <morrone2@llnl.gov>
Date: Mon, 7 Aug 2006 22:50:39 +0000
Subject: [PATCH] Fix sbatch for test17.6
---
src/sbatch/sbatch.c | 4 ++--
testsuite/expect/test17.6 | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/sbatch/sbatch.c b/src/sbatch/sbatch.c
index b51820d13ca..4fb781c6912 100644
--- a/src/sbatch/sbatch.c
+++ b/src/sbatch/sbatch.c
@@ -176,8 +176,8 @@ static int fill_job_desc_from_opts(job_desc_msg_t *desc)
desc->environment = environ;
desc->env_size = envcount (environ);
-/* desc->argv = remote_argv; */
-/* desc->argc = remote_argc; */
+ desc->argv = remote_argv;
+ desc->argc = remote_argc;
desc->err = opt.efname;
desc->in = opt.ifname;
desc->out = opt.ofname;
diff --git a/testsuite/expect/test17.6 b/testsuite/expect/test17.6
index 122af15bfe0..5022b13ed4c 100755
--- a/testsuite/expect/test17.6
+++ b/testsuite/expect/test17.6
@@ -45,7 +45,7 @@ print_header $test_id
# Delete left-over stdin/out/err files
# Build stdin file
#
-exec $bin_rm -f $file_in $file_out
+file delete $file_in $file_out
make_bash_script $file_in "
$srun -n $task_cnt --overcommit $bin_id
"
@@ -101,7 +101,7 @@ if {$task_cnt != $tasks} {
set exit_code 1
}
if {$exit_code == 0} {
- exec $bin_rm -f $file_in $file_out
+ file delete $file_in $file_out
send_user "\nSUCCESS\n"
}
exit $exit_code
--
GitLab