← Back to branch summary

~ubuntu-branches/ubuntu/saucy/slurm-llnl/saucy

« back to all changes in this revision

Viewing changes to testsuite/expect/test14.8

  • Committer: Bazaar Package Importer
  • Author(s): Gennaro Oliva
  • Date: 2008-05-30 13:11:30 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20080530131130-l6ko6aie7xhrlmxe
Tags: 1.3.3-1
* New upstream release
* Removed patches to src/slurmctd/controller.c src/slurmdbd/slurmdbd.c
  doc/man/man1/sacctmgr.1 included to upstream
* Edited watch file to seek for 1.3 releases
* doc/man/man1/salloc.1 doc/man/man1/sbatch.1 doc/man/man5/slurm.conf.5
  patched to improve formatting and avoid manual warnings 

Show diffs side-by-side

added added

removed removed

Lines of Context:
testsuite/expect/test14.8
14
14
# Copyright (C) 2006 The Regents of the University of California.
15
15
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
16
16
# Written by Morris Jette <jette1@llnl.gov>
17
 
# UCRL-CODE-226842.
 
17
# LLNL-CODE-402394.
18
18
# 
19
19
# This file is part of SLURM, a resource management program.
20
20
# For details, see <http://www.llnl.gov/linux/slurm/>.
75
75
"
76
76
 
77
77
#
78
 
# Spawn a srun batch job that uses stdout and confirm its contents
 
78
# Spawn an sbatch job that uses stdout and confirm its contents
79
79
#
80
80
set timeout $max_job_delay
81
 
set srun_pid [spawn $srun -N1-4 --batch --output=$file_out -t1 $file_in]
 
81
set sbatch_pid [spawn $sbatch -N1-4 --output=$file_out -t1 $file_in]
82
82
expect {
83
 
        -re "jobid ($number) submitted" {
 
83
        -re "Submitted batch job ($number)" {
84
84
                set job_id $expect_out(1,string)
85
85
                exp_continue
86
86
        }
87
87
        timeout {
88
88
                send_user "\nFAILURE: srun not responding\n"
89
 
                slow_kill $srun_pid
 
89
                slow_kill $sbatch_pid
90
90
                set exit_code 1
91
91
        }
92
92
        eof {