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

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh
index 696088c6d4a427dbbd85b538cc075dea825929d4..f1887ea78e99303b3b391b0219f859ba5cb3702e 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh
@@ -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

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh
index 96b05d5cde2d955de0dd4e59e0e93848a1174573..7dcfd41d807a00542cf546e90a25f54a78ad0940 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh
@@ -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

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh
index d0ac1864877e2045f8927355080867ac53fd7959..2a1f9b6ed784f33a214e24353b6a882c7cf2d3b0 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh
@@ -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

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh
index d40036d8c5769230d11ad6eac33046e06a56ed58..662076a5a2d4622c68b9d303ee35d9a181797613 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh
@@ -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

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh
index 51afe961a843e4a634061a5edbdb885250e629a9..43726a252b8b0d619452cca02b8ab2d6d8ec17f3 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh
@@ -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

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh
index 3ee9e9f228d57f82c0a98623d2020442a4985b5e..72304cb74bc5da375d762c8b07facc3401ece5a8 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh
@@ -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

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh
index 37ad97c3b0f11e3f88d22dcab820d8fa02e9a2d9..ef0752579b2d379752a48ca1a9eb8d0bda3db643 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh
@@ -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

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh
index a1ef9d89c30bcb47499f70eb1035c3d07c7a98e0..4aa3f59e16f9240b1df6e97f1ca7469e832c9bc8 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh
@@ -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

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh
index ffc5107b1bfac0909d3e9d9d6b4210f9481dd514..01d127fdd338362045e9f8126e1f476566aff47b 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh
@@ -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

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh
index 3f545a7bd48e813dddd9b37665ca173db5297bab..b517e88e0ab324bae554c81bf62aa1b44da0b6f0 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh
@@ -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

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh
index bf267c7c27f498abd43d77d2e73b58933281a1f4..9620b97cb0191b43a1bcf6b3e5fb5bda1c2e2efc 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh
@@ -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"

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh
index 2c1aedcdece40e55ad6469a80504415919a48c9b..4f3264f74a599c356a01d2a13c3ff655ae180afd 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh
@@ -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"

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
index 905fb5538fc8a89d211c91552e866c1ad31976c4..a2837d888cc9f27414548971f79672c205f93972 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
@@ -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

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
index 2afd78165fc42a242399711605db416f854ea07d..16ff34ae421711e6b8b3ebca835ec85b51b731f8 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
@@ -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

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh
index 9def3c002b9ae5cafbaef4fe1de1839fcf00aef0..db2771ab32c08b6856378ed5a4da0a0b56557747 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh
@@ -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

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
index 4f6c0ac87d9744abf34b3bfa8b3015d3d885170e..8ce1dc0181d09df55371d98d9b85ca1fb61f9c90 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
@@ -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

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh
index 4ea33f76d83c2ea7e214fc42be9db9fba0aff1f2..2c6c7bc9f89a2f36a51dc093ce76cb8f3df14f6a 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh
@@ -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

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh
index 0cddf0db810e13a046a737a8b304cda1d2752806..8a19c77010b6b55d942926f1eda9ff7db9cb96ff 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh
@@ -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

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh
index 8385b27cdfe48031a7f6f6fe240cb11a20bdd0ad..a6ddfe854156bc3e1f9a1f4c1e688faa31d36f40 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh
@@ -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

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh
index 89ceb4a94858372a0568d99f74b4f7d0353d8d52..3c2295837ec79e58bad2291c5b6393c698684cc0 100644 (file)
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh
@@ -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