diff --git a/testsuite/expect/Makefile.am b/testsuite/expect/Makefile.am index 521277c0003aae1f0d548dca35f02ffd303f059c..c96b2cb6c4c6520d112b6cd88dde726aac0e6088 100644 --- a/testsuite/expect/Makefile.am +++ b/testsuite/expect/Makefile.am @@ -273,7 +273,6 @@ EXTRA_DIST = \ test17.16 \ test17.17 \ test17.18 \ - test17.19 \ test17.20 \ test17.21 \ test17.22 \ diff --git a/testsuite/expect/Makefile.in b/testsuite/expect/Makefile.in index 243e57c3c57ab53368a064dbfe50bb6755236126..5db8a2983698bc891aa88d423ecdbaa9974eea6a 100644 --- a/testsuite/expect/Makefile.in +++ b/testsuite/expect/Makefile.in @@ -517,7 +517,6 @@ EXTRA_DIST = \ test17.16 \ test17.17 \ test17.18 \ - test17.19 \ test17.20 \ test17.21 \ test17.22 \ diff --git a/testsuite/expect/README b/testsuite/expect/README index 1b3531308ecdfe808bd0dae35b3cc3a1131c841b..bc257d56a542db8de179ad3f49ff31515f27f647 100644 --- a/testsuite/expect/README +++ b/testsuite/expect/README @@ -8,7 +8,7 @@ # # This file is part of SLURM, a resource management program. # 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 # 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 --share options) test17.18 Test of job dependencies and deferred begin time (--depedency and --begin options). -test17.19 Test the launch of a batch job within an existing job allocation. - This logic is used by LSF +test17.19 REMOVED test17.20 Test of mail options (--mail-type and --mail-user options) test17.21 Tests #SLURM entry functionality in a batch script test17.22 Test of running non-existant job, confirm timely termination. diff --git a/testsuite/expect/test17.19 b/testsuite/expect/test17.19 deleted file mode 100755 index 1d73e5c37ec5fca64739f48f14c9c181d83196d0..0000000000000000000000000000000000000000 --- a/testsuite/expect/test17.19 +++ /dev/null @@ -1,109 +0,0 @@ -#!/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