Skip to content
Snippets Groups Projects
Commit 60477ab8 authored by Moe Jette's avatar Moe Jette
Browse files

Remove duplicated test. test17.19 was essentially identical to test15.17

parent 1facbc25
No related branches found
No related tags found
No related merge requests found
...@@ -273,7 +273,6 @@ EXTRA_DIST = \ ...@@ -273,7 +273,6 @@ EXTRA_DIST = \
test17.16 \ test17.16 \
test17.17 \ test17.17 \
test17.18 \ test17.18 \
test17.19 \
test17.20 \ test17.20 \
test17.21 \ test17.21 \
test17.22 \ test17.22 \
......
...@@ -517,7 +517,6 @@ EXTRA_DIST = \ ...@@ -517,7 +517,6 @@ EXTRA_DIST = \
test17.16 \ test17.16 \
test17.17 \ test17.17 \
test17.18 \ test17.18 \
test17.19 \
test17.20 \ test17.20 \
test17.21 \ test17.21 \
test17.22 \ test17.22 \
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
# #
# This file is part of SLURM, a resource management program. # This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>. # For details, see <https://computing.llnl.gov/linux/slurm/>.
# Please also read the supplied file: DISCLAIMER. # Please also read the supplied file: DISCLAIMER.
# #
# SLURM is free software; you can redistribute it and/or modify it under # SLURM is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free # the terms of the GNU General Public License as published by the Free
...@@ -460,8 +460,7 @@ test17.17 Confirm that node sharing flags are respected (--nodelist and ...@@ -460,8 +460,7 @@ test17.17 Confirm that node sharing flags are respected (--nodelist and
--share options) --share options)
test17.18 Test of job dependencies and deferred begin time (--depedency test17.18 Test of job dependencies and deferred begin time (--depedency
and --begin options). and --begin options).
test17.19 Test the launch of a batch job within an existing job allocation. test17.19 REMOVED
This logic is used by LSF
test17.20 Test of mail options (--mail-type and --mail-user options) test17.20 Test of mail options (--mail-type and --mail-user options)
test17.21 Tests #SLURM entry functionality in a batch script test17.21 Tests #SLURM entry functionality in a batch script
test17.22 Test of running non-existant job, confirm timely termination. test17.22 Test of running non-existant job, confirm timely termination.
......
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
# Test the launch of a batch job within an existing job allocation.
# This logic is used by LSF
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
############################################################################
# Copyright (C) 2005-2006 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# Please also read the included file: DISCLAIMER.
#
# SLURM is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation; either version 2 of the License, or (at your option)
# any later version.
#
# SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
# details.
#
# You should have received a copy of the GNU General Public License along
# with SLURM; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
############################################################################
source ./globals
set test_id "17.19"
set file_in "test$test_id.input"
set exit_code 0
set job_id_1 0
set job_id_2 0
print_header $test_id
#
# Build input script file
#
exec $bin_rm -f $file_in
make_bash_script $file_in "$bin_printenv SLURMD_NODENAME"
#
# Spawn a batch job that uses stdout/err and confirm their contents
#
set timeout $max_job_delay
if { [test_bluegene] } {
set node_cnt 1-2048
} else {
if { [test_xcpu] } {
set node_cnt 1-1
} else {
set node_cnt 1-4
}
}
set salloc_pid [spawn $salloc -N$node_cnt -v -t1 $bin_bash]
expect {
-re "Granted job allocation ($number)" {
set job_id_1 $expect_out(1,string)
send "$sbatch --jobid=$job_id_1 -o none -e none $file_in \n"
exp_continue
}
-re "Submitted batch job ($number)" {
set job_id_2 $expect_out(1,string)
send "exit \n"
exp_continue
}
-re "Submitted batch job ($number).0" {
set job_id_2 $expect_out(1,string)
send "exit \n"
exp_continue
}
timeout {
send_user "\nFAILURE: srun not responding\n"
slow_kill $salloc_pid
set exit_code 1
}
eof {
wait
}
}
if {$job_id_1 == 0} {
send_user "\nFAILURE: job allocation failure\n"
exit 1
}
if {$job_id_1 != $job_id_2} {
send_user "\nFAILURE: batch job did not run in existing allocation\n"
exit 1
}
if [file exists none] {
send_user "\nFAILURE: created file 'none', should have mapped to no file\n"
exit 1
}
if {$exit_code == 0} {
send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in
}
exit $exit_code
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