Date: Wed, 30 Sep 2015 04:48:56 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r288413 - head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt Message-ID: <201509300448.t8U4mur9079187@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Wed Sep 30 04:48:56 2015 New Revision: 288413 URL: https://svnweb.freebsd.org/changeset/base/288413 Log: Stop hard-coding a 32-bit data model for USDT tests, and just use the native model. This was causing many of the tests to fail on amd64 since USDT support for 32-bit programs is currently non-functional. MFC after: 1 week Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -69,7 +69,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: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -77,7 +77,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -66,7 +66,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -82,7 +82,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -75,7 +75,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -76,7 +76,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -70,7 +70,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -67,7 +67,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -69,7 +69,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -70,7 +70,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -71,7 +71,7 @@ EOF exit 1 fi - $dtrace -G -32 -s $oogle.d $oogle.o -o $oogle.d.o + $dtrace -G -s $oogle.d $oogle.o -o $oogle.d.o if [ $? -ne 0 ]; then print -u2 "failed to process $oogle.d" Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -47,7 +47,7 @@ provider doogle { EOF cc -c test.c -$dtrace -G -32 -s doogle.d test.o -o doogle.d.o +$dtrace -G -s doogle.d test.o -o doogle.d.o if [ $? -eq 0 ]; then print -u2 "dtrace succeeded despite having no probe sites" Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -56,7 +56,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -56,7 +56,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -67,7 +67,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -56,7 +56,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -57,7 +57,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -68,7 +68,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -72,13 +72,13 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create initial DOF" exit 1 fi rm -f prov.o -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create final DOF" exit 1 Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh Wed Sep 30 03:37:37 2015 (r288412) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh Wed Sep 30 04:48:56 2015 (r288413) @@ -67,7 +67,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509300448.t8U4mur9079187>