svn rev #22647: trunk/src/kadmin/testing/scripts/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22647
Commit By: ghudson
Log Message:
Clean up a little bit of test suite spew in env-setup: first, when
using BSD options with ps, they should not be prefixed with a '-';
second, the Linux ps supports both BSD and System V options, so change
the structure of the tests not to warn when both forms work.



Changed Files:
U   trunk/src/kadmin/testing/scripts/env-setup.shin
Modified: trunk/src/kadmin/testing/scripts/env-setup.shin
===================================================================
--- trunk/src/kadmin/testing/scripts/env-setup.shin	2009-08-28 21:02:51 UTC (rev 22646)
+++ trunk/src/kadmin/testing/scripts/env-setup.shin	2009-08-28 21:22:10 UTC (rev 22647)
@@ -90,21 +90,15 @@
 fi
 
 if [ "x$PS_ALL" = "x" ]; then
-	ps -axwwu >/dev/null 2>&1
-	ps_bsd=$?
-
-	ps -ef >/dev/null 2>&1
-	ps_sysv=$?
-
-	if [ $ps_bsd = 0 -a $ps_sysv = 1 ]; then
-		PS_ALL="ps -auxww"
-		PS_PID="ps -auxww"
-	elif [ $ps_bsd = 1 -a $ps_sysv = 0 ]; then
+	if ps auxww >/dev/null 2>&1; then
+		PS_ALL="ps auxww"
+		PS_PID="ps auxww"
+	elif ps -ef >/dev/null 2>&1; then
 		PS_ALL="ps -ef"
 		PS_PID="ps -fp"
 	else
-		PS_ALL="ps -auxww"
-		PS_PID="ps -auxww"
+		PS_ALL="ps auxww"
+		PS_PID="ps auxww"
 		echo "WARNING!  Cannot auto-detect ps type, assuming BSD."
 	fi