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
This commit is contained in:
parent
794ac42374
commit
c5af5ada34
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=288413
@ -69,7 +69,7 @@ prov.h: prov.d
|
|||||||
$dtrace -h -s prov.d
|
$dtrace -h -s prov.d
|
||||||
|
|
||||||
prov.o: prov.d main.o
|
prov.o: prov.d main.o
|
||||||
$dtrace -G -32 -s prov.d main.o
|
$dtrace -G -s prov.d main.o
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
cat > prov.d <<EOF
|
cat > prov.d <<EOF
|
||||||
|
@ -77,7 +77,7 @@ if [ $? -ne 0 ]; then
|
|||||||
print -u2 "failed to compile test.c"
|
print -u2 "failed to compile test.c"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
$dtrace -G -32 -s prov.d test.o
|
$dtrace -G -s prov.d test.o
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to create DOF"
|
print -u2 "failed to create DOF"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -66,7 +66,7 @@ if [ $? -ne 0 ]; then
|
|||||||
print -u2 "failed to compile test.c"
|
print -u2 "failed to compile test.c"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
$dtrace -G -32 -s prov.d test.o
|
$dtrace -G -s prov.d test.o
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to create DOF"
|
print -u2 "failed to create DOF"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -82,7 +82,7 @@ if [ $? -ne 0 ]; then
|
|||||||
print -u2 "failed to compile test.c"
|
print -u2 "failed to compile test.c"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
$dtrace -G -32 -s prov.d test.o
|
$dtrace -G -s prov.d test.o
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to create DOF"
|
print -u2 "failed to create DOF"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -75,7 +75,7 @@ if [ $? -ne 0 ]; then
|
|||||||
print -u2 "failed to compile test.c"
|
print -u2 "failed to compile test.c"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
$dtrace -G -32 -s prov.d test.o
|
$dtrace -G -s prov.d test.o
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to create DOF"
|
print -u2 "failed to create DOF"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -76,7 +76,7 @@ if [ $? -ne 0 ]; then
|
|||||||
print -u2 "failed to compile test.c"
|
print -u2 "failed to compile test.c"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
$dtrace -G -32 -s prov.d test.o
|
$dtrace -G -s prov.d test.o
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to create DOF"
|
print -u2 "failed to create DOF"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -70,7 +70,7 @@ if [ $? -ne 0 ]; then
|
|||||||
print -u2 "failed to compile test.c"
|
print -u2 "failed to compile test.c"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
$dtrace -G -32 -s prov.d test.o
|
$dtrace -G -s prov.d test.o
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to create DOF"
|
print -u2 "failed to create DOF"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -67,7 +67,7 @@ if [ $? -ne 0 ]; then
|
|||||||
print -u2 "failed to compile test.c"
|
print -u2 "failed to compile test.c"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
$dtrace -G -32 -s prov.d test.o
|
$dtrace -G -s prov.d test.o
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to create DOF"
|
print -u2 "failed to create DOF"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -69,7 +69,7 @@ if [ $? -ne 0 ]; then
|
|||||||
print -u2 "failed to compile test.c"
|
print -u2 "failed to compile test.c"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
$dtrace -G -32 -s prov.d test.o
|
$dtrace -G -s prov.d test.o
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to create DOF"
|
print -u2 "failed to create DOF"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -70,7 +70,7 @@ if [ $? -ne 0 ]; then
|
|||||||
print -u2 "failed to compile test.c"
|
print -u2 "failed to compile test.c"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
$dtrace -G -32 -s prov.d test.o
|
$dtrace -G -s prov.d test.o
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to create DOF"
|
print -u2 "failed to create DOF"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -71,7 +71,7 @@ EOF
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
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
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to process $oogle.d"
|
print -u2 "failed to process $oogle.d"
|
||||||
|
@ -47,7 +47,7 @@ provider doogle {
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
cc -c test.c
|
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
|
if [ $? -eq 0 ]; then
|
||||||
print -u2 "dtrace succeeded despite having no probe sites"
|
print -u2 "dtrace succeeded despite having no probe sites"
|
||||||
|
@ -56,7 +56,7 @@ if [ $? -ne 0 ]; then
|
|||||||
print -u2 "failed to compile test.c"
|
print -u2 "failed to compile test.c"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
$dtrace -G -32 -s prov.d test.o
|
$dtrace -G -s prov.d test.o
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to create DOF"
|
print -u2 "failed to create DOF"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -56,7 +56,7 @@ if [ $? -ne 0 ]; then
|
|||||||
print -u2 "failed to compile test.c"
|
print -u2 "failed to compile test.c"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
$dtrace -G -32 -s prov.d test.o
|
$dtrace -G -s prov.d test.o
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to create DOF"
|
print -u2 "failed to create DOF"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -67,7 +67,7 @@ if [ $? -ne 0 ]; then
|
|||||||
print -u2 "failed to compile test.c"
|
print -u2 "failed to compile test.c"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
$dtrace -G -32 -s prov.d test.o
|
$dtrace -G -s prov.d test.o
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to create DOF"
|
print -u2 "failed to create DOF"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -56,7 +56,7 @@ if [ $? -ne 0 ]; then
|
|||||||
print -u2 "failed to compile test.c"
|
print -u2 "failed to compile test.c"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
$dtrace -G -32 -s prov.d test.o
|
$dtrace -G -s prov.d test.o
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to create DOF"
|
print -u2 "failed to create DOF"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -57,7 +57,7 @@ if [ $? -ne 0 ]; then
|
|||||||
print -u2 "failed to compile test.c"
|
print -u2 "failed to compile test.c"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
$dtrace -G -32 -s prov.d test.o
|
$dtrace -G -s prov.d test.o
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to create DOF"
|
print -u2 "failed to create DOF"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -68,7 +68,7 @@ if [ $? -ne 0 ]; then
|
|||||||
print -u2 "failed to compile test.c"
|
print -u2 "failed to compile test.c"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
$dtrace -G -32 -s prov.d test.o
|
$dtrace -G -s prov.d test.o
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to create DOF"
|
print -u2 "failed to create DOF"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -72,13 +72,13 @@ if [ $? -ne 0 ]; then
|
|||||||
print -u2 "failed to compile test.c"
|
print -u2 "failed to compile test.c"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
$dtrace -G -32 -s prov.d test.o
|
$dtrace -G -s prov.d test.o
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to create initial DOF"
|
print -u2 "failed to create initial DOF"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
rm -f prov.o
|
rm -f prov.o
|
||||||
$dtrace -G -32 -s prov.d test.o
|
$dtrace -G -s prov.d test.o
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to create final DOF"
|
print -u2 "failed to create final DOF"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -67,7 +67,7 @@ if [ $? -ne 0 ]; then
|
|||||||
print -u2 "failed to compile test.c"
|
print -u2 "failed to compile test.c"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
$dtrace -G -32 -s prov.d test.o
|
$dtrace -G -s prov.d test.o
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
print -u2 "failed to create DOF"
|
print -u2 "failed to create DOF"
|
||||||
exit 1
|
exit 1
|
||||||
|
Loading…
Reference in New Issue
Block a user