From 1d3455d0ff72ffc4af284ec605b5573becdffa45 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 24 Aug 2007 16:01:19 +0000
Subject: [PATCH] svn merge -r12131:12134 
 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2

---
 testsuite/expect/Makefile.am | 1 +
 testsuite/expect/Makefile.in | 1 +
 testsuite/expect/README      | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/testsuite/expect/Makefile.am b/testsuite/expect/Makefile.am
index ab5c03eb663..3e875933a19 100644
--- a/testsuite/expect/Makefile.am
+++ b/testsuite/expect/Makefile.am
@@ -264,6 +264,7 @@ EXTRA_DIST = \
 	test17.28			\
 	test17.29			\
 	test17.30			\
+	test17.31			\
 	test19.1			\
 	test19.2			\
 	test19.3			\
diff --git a/testsuite/expect/Makefile.in b/testsuite/expect/Makefile.in
index e4a2979eccd..8bcac73255b 100644
--- a/testsuite/expect/Makefile.in
+++ b/testsuite/expect/Makefile.in
@@ -490,6 +490,7 @@ EXTRA_DIST = \
 	test17.28			\
 	test17.29			\
 	test17.30			\
+	test17.31			\
 	test19.1			\
 	test19.2			\
 	test19.3			\
diff --git a/testsuite/expect/README b/testsuite/expect/README
index 46d28b7e7e5..bccdcc8a595 100644
--- a/testsuite/expect/README
+++ b/testsuite/expect/README
@@ -440,7 +440,7 @@ test17.27  Test that a job executes with the specified nodes, requires multiple
 test17.28  Tests #SBATCH entry functionality in a batch script.
 test17.29  Verify that command arguments get forwarded to job script.
 test17.30  Test of comment field specification (--comment option).
-test17.28  Tests #PBS entry functionality in a batch script.
+test17.31  Tests #PBS entry functionality in a batch script.
 
 
 test19.#   Testing of strigger options.
-- 
GitLab