svn commit: r271698 - head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf

[Mark Johnston]

Author: markj
Date: Wed Sep 17 03:40:49 2014
New Revision: 271698
URL: http://svnweb.freebsd.org/changeset/base/271698

Log:
  Fix a number of typos and programming errors in the userland CTF tests. It
  seems that they would only pass by chance on illumos; on FreeBSD, they still
  fail since userland CTF is not yet supported.
  
  MFC after:	1 week
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh	Wed Sep 17 02:43:47 2014	(r271697)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh	Wed Sep 17 03:40:49 2014	(r271698)
@@ -29,6 +29,7 @@ dtrace=$1
 t="season_8_mountain_of_madness_t"
 pid=$$
 
-rc=`$dtrace -n "BEGIN{ trace(pid$pid`$t)0); }"`
+$dtrace -n "BEGIN{ trace(pid$pid\`$t)0); }"
+rc=$?
 
 exit $rc

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh	Wed Sep 17 02:43:47 2014	(r271697)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh	Wed Sep 17 03:40:49 2014	(r271698)
@@ -30,6 +30,7 @@ dtrace=$1
 t="season_8_mountain_of_madness_t"
 pid=$$
 
-rc=`$dtrace -n "BEGIN{ trace(pid`$t)0); }"` -p $pid
+$dtrace -n "BEGIN{ trace(pid$pid\`$t)0); }" -p $pid
+rc=$?
 
 exit $rc

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh	Wed Sep 17 02:43:47 2014	(r271697)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh	Wed Sep 17 03:40:49 2014	(r271698)
@@ -25,7 +25,7 @@ if [ $# != 1 ]; then
 fi
 
 dtrace=$1
-t="season_7_lisa_the_vegetrian_t *"
+t="season_7_lisa_the_vegetarian_t *"
 exe="tst.aouttype.exe"
 
 elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' 
@@ -37,7 +37,8 @@ fi
 ./$exe &
 pid=$!
 
-rc=`$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }"`
+$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }"
+rc=$?
 
 kill -9 $pid
 

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh	Wed Sep 17 02:43:47 2014	(r271697)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh	Wed Sep 17 03:40:49 2014	(r271698)
@@ -38,7 +38,8 @@ fi
 ./$exe &
 pid=$!
 
-rc=`$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }"`
+$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }"
+rc=$?
 
 kill -9 $pid