PERFORCE change 133840 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=133840

Change 133840 by jb at jb_freebsd1 on 2008/01/22 01:53:53

	I have no option but to edit these tests because FreeBSD != Solaris.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#5 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#5 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#5 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#5 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#5 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#5 (text+ko) ====

@@ -36,12 +36,12 @@
 {
 	$dtrace -s /dev/stdin <<EOF
 	proc:::exec
-	/curpsinfo->pr_ppid == $child && args[0] == "/usr/bin/sleep"/
+	/curpsinfo->pr_ppid == $child && args[0] == "/bin/sleep"/
 	{
 		self->exec = 1;
 	}
 
-	proc:::exec-success
+	proc:::exec_success
 	/self->exec/
 	{
 		exit(0);
@@ -52,7 +52,7 @@
 sleeper()
 {
 	while true; do
-		/usr/bin/sleep 1
+		/bin/sleep 1
 	done
 }
 

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#5 (text+ko) ====

@@ -42,7 +42,7 @@
 		self->exec = 1;
 	}
 
-	proc:::exec-failure
+	proc:::exec_failure
 	/self->exec && args[0] == ENOENT/
 	{
 		exit(0);
@@ -53,7 +53,7 @@
 sleeper()
 {
 	while true; do
-		/usr/bin/sleep 1
+		/bin/sleep 1
 		$badexec
 	done
 }

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#5 (text+ko) ====

@@ -45,7 +45,7 @@
 		self->exec = 1;
 	}
 
-	proc:::exec-failure
+	proc:::exec_failure
 	/self->exec/
 	{
 		exit(0);
@@ -56,7 +56,7 @@
 sleeper()
 {
 	while true; do
-		/usr/bin/sleep 1
+		/bin/sleep 1
 		$badexec
 	done
 }

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#5 (text+ko) ====

@@ -43,18 +43,16 @@
 	$dtrace -s /dev/stdin <<EOF
 	proc:::exit
 	/curpsinfo->pr_ppid == $child &&
-	    curpsinfo->pr_psargs == "$longsleep" && args[0] == CLD_DUMPED/
+	    execargs == "$longsleep" && args[0] == CLD_DUMPED/
 	{
 		exit(0);
 	}
 
 	proc:::exit
 	/curpsinfo->pr_ppid == $child &&
-	    curpsinfo->pr_psargs == "$longsleep" && args[0] != CLD_DUMPED/
+	    execargs == "$longsleep" && args[0] != CLD_DUMPED/
 	{
-		printf("Child process could not dump core.  Check coreadm(1M)");
-		printf(" settings; either per-process or global core dumps ");
-		printf("must be enabled for this test to work properly.");
+		printf("Child process could did dump core.");
 		exit(1);
 	}
 EOF
@@ -62,13 +60,12 @@
 
 sleeper()
 {
-	/usr/bin/coreadm -p $corefile
 	while true; do
 		$longsleep &
-		/usr/bin/sleep 1
+		/bin/sleep 1
 		kill -SEGV $!
 	done
-	/usr/bin/rm -f $corefile
+	/bin/rm -f $corefile
 }
 
 if [ $# != 1 ]; then
@@ -77,8 +74,8 @@
 fi
 
 dtrace=$1
-longsleep="/usr/bin/sleep 10000"
-corefile=/tmp/core.$$
+longsleep="/bin/sleep 10000"
+corefile=/tmp/sleep.core
 
 sleeper &
 child=$!
@@ -86,10 +83,10 @@
 script
 status=$?
 
-pstop $child
-pkill -P $child
+#pstop $child
+#pkill -P $child
 kill $child
-prun $child
+#prun $child
 
-/usr/bin/rm -f $corefile
+/bin/rm -f $corefile
 exit $status

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#5 (text+ko) ====

@@ -46,7 +46,7 @@
 sleeper()
 {
 	while true; do
-		/usr/bin/sleep 1
+		/bin/sleep 1
 	done
 }