From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 30 Jul 2014 17:56:35 +0000 (+0000)
Subject: Save work on test suite to ensure we collect the exit status of all child
X-Git-Tag: v2.2b1~544
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a8db0cddf858302993df2bb0c6b62309d2340a9;p=thirdparty%2Fcups.git

Save work on test suite to ensure we collect the exit status of all child
print processes.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12065 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/test/5.5-lp.sh b/test/5.5-lp.sh
index 949f3d7708..a74f19bf73 100644
--- a/test/5.5-lp.sh
+++ b/test/5.5-lp.sh
@@ -4,7 +4,7 @@
 #
 #   Test the lp command.
 #
-#   Copyright 2007-2012 by Apple Inc.
+#   Copyright 2007-2014 by Apple Inc.
 #   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -55,6 +55,7 @@ echo ""
 echo "    lp -d Test1 testfile.jpg"
 echo "    lp -d Test2 testfile.jpg"
 i=0
+pids=""
 while test $i -lt $1; do
 	j=1
 	while test $j -le $2; do
@@ -63,12 +64,13 @@ while test $i -lt $1; do
 	done
 
 	$VALGRIND ../systemv/lp -d Test1 testfile.jpg 2>&1 &
+	pids="$pids $!"
 	$VALGRIND ../systemv/lp -d Test2 testfile.jpg 2>&1 &
-	lppid=$!
+	pids="$pids $!"
 
 	i=`expr $i + 1`
 done
-wait $lppid
+wait $pids
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/5.6-lpr.sh b/test/5.6-lpr.sh
index 5d0663af3d..7298792f65 100644
--- a/test/5.6-lpr.sh
+++ b/test/5.6-lpr.sh
@@ -4,7 +4,7 @@
 #
 #   Test the lpr command.
 #
-#   Copyright 2007-2012 by Apple Inc.
+#   Copyright 2007-2014 by Apple Inc.
 #   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -55,6 +55,7 @@ echo ""
 echo "    lpr -P Test1 testfile.jpg"
 echo "    lpr -P Test2 testfile.jpg"
 i=0
+pids=""
 while test $i -lt $1; do
 	j=1
 	while test $j -le $2; do
@@ -63,12 +64,13 @@ while test $i -lt $1; do
 	done
 
 	$VALGRIND ../berkeley/lpr -P Test1 testfile.jpg 2>&1 &
+	pids="$pids $!"
 	$VALGRIND ../berkeley/lpr -P Test2 testfile.jpg 2>&1 &
-	lprpid=$!
+	pids="$pids $!"
 
 	i=`expr $i + 1`
 done
-wait $lppid
+wait $pids
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index a9d1afa553..641e03b780 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -199,6 +199,7 @@ if test -d /private/tmp; then
 else
 	BASE=/tmp/cups-$user
 fi
+export BASE
 
 #
 # Make sure that the LPDEST and PRINTER environment variables are