svn commit: r313126 - in stable/11/cddl: contrib/opensolaris/cmd/dtrace/test/tst/common/pid contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n usr.sbin/dtrace/tests/tools

[Mark Johnston]

Author: markj
Date: Fri Feb  3 01:18:47 2017
New Revision: 313126
URL: https://svnweb.freebsd.org/changeset/base/313126

Log:
  MFC r309698, r309699, r309700:
  DTrace test fixes.

Modified:
  stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh
  stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh
  stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh
  stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh
  stable/11/cddl/usr.sbin/dtrace/tests/tools/dtest.sh
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh
==============================================================================
--- stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh	Fri Feb  3 01:16:54 2017	(r313125)
+++ stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh	Fri Feb  3 01:18:47 2017	(r313126)
@@ -56,7 +56,7 @@ prov.h: prov.d
 	$dtrace -h -s prov.d
 
 prov.o: prov.d main.o
-	$dtrace -G -32 -s prov.d main.o
+	$dtrace -G -s prov.d main.o
 EOF
 
 cat > prov.d <<EOF

Modified: stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh
==============================================================================
--- stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh	Fri Feb  3 01:16:54 2017	(r313125)
+++ stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh	Fri Feb  3 01:18:47 2017	(r313126)
@@ -45,7 +45,7 @@ EOF
 spinny()
 {
 	while true; do
-		/usr/bin/date > /dev/null
+		/bin/date > /dev/null
 	done
 }
 

Modified: stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh
==============================================================================
--- stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh	Fri Feb  3 01:16:54 2017	(r313125)
+++ stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh	Fri Feb  3 01:18:47 2017	(r313126)
@@ -45,7 +45,7 @@ EOF
 spinny()
 {
 	while true; do
-		/usr/bin/date > /dev/null
+		/bin/date > /dev/null
 	done
 }
 

Modified: stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh
==============================================================================
--- stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh	Fri Feb  3 01:16:54 2017	(r313125)
+++ stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh	Fri Feb  3 01:18:47 2017	(r313126)
@@ -45,7 +45,7 @@ EOF
 spinny()
 {
 	while true; do
-		/usr/bin/date > /dev/null
+		/bin/date > /dev/null
 	done
 }
 

Modified: stable/11/cddl/usr.sbin/dtrace/tests/tools/dtest.sh
==============================================================================
--- stable/11/cddl/usr.sbin/dtrace/tests/tools/dtest.sh	Fri Feb  3 01:16:54 2017	(r313125)
+++ stable/11/cddl/usr.sbin/dtrace/tests/tools/dtest.sh	Fri Feb  3 01:18:47 2017	(r313126)
@@ -70,7 +70,7 @@ runtest()
     err.*.ksh|tst.*.ksh)
         expr "$TFILE" : 'err.*' >/dev/null && exstatus=1
 
-        ksh "$TFILE" /usr/sbin/dtrace >$STDOUT 2>$STDERR
+        tst=$TFILE ksh "$TFILE" /usr/sbin/dtrace >$STDOUT 2>$STDERR
         status=$?
 
         if [ $status -ne $exstatus ]; then