[DTrace-devel] [PATCH v2 4/4] test: allow overriding CC, OBJCOPY, OBJDUMP, NM, ...
eugene.loh at oracle.com
eugene.loh at oracle.com
Fri May 9 04:59:24 UTC 2025
From: Eugene Loh <eugene.loh at oracle.com>
Bug: https://github.com/oracle/dtrace-utils/issues/75
Signed-off-by: Sam James <sam at gentoo.org>
Signed-off-by: Eugene Loh <eugene.loh at oracle.com>
---
runtest.sh | 5 +++++
.../expensive/locking/tst.DestructionDoubleUnlock.sh | 3 +--
test/internals/headers/tst.header-endianness.sh | 3 +--
test/stress/options/tst.cpu-syscall.sh | 4 ++--
test/unittest/aggs/tst.aggmod_full2.sh | 3 +--
test/unittest/arrays/tst.uregsarray-check.sh | 3 +--
test/unittest/bitfields/tst.bitfield-offset.x | 8 ++++----
test/unittest/builtinvar/tst.errno3.sh | 3 +--
test/unittest/builtinvar/tst.tid_pid.sh | 1 -
test/unittest/dtrace-util/tst.ListProbesArgsUSDT.sh | 3 +--
test/unittest/dtrace-util/tst.ListProbesFuncUSDT.sh | 3 +--
.../unittest/dtrace-util/tst.ListProbesModuleUSDT.sh | 3 +--
test/unittest/dtrace-util/tst.ListProbesNameUSDT.sh | 3 +--
.../dtrace-util/tst.ListProbesProviderUSDT.sh | 3 +--
test/unittest/fbtprovider/tst.entryargs2.sh | 1 -
test/unittest/funcs/copyout/tst.copyout.sh | 4 ++--
test/unittest/funcs/copyoutstr/tst.copyoutstr.sh | 4 ++--
test/unittest/misc/tst.include.sh | 3 +--
test/unittest/options/tst.cpu-syscall.sh | 4 ++--
test/unittest/options/tst.ctypes.sh | 8 ++++----
test/unittest/options/tst.dtypes.sh | 8 ++++----
test/unittest/options/tst.linktype.sh | 5 ++---
test/unittest/options/tst.strip.sh | 5 ++---
test/unittest/pid/tst.dash.sh | 4 ++--
test/unittest/pid/tst.offsets.sh | 6 +++---
test/unittest/pid/tst.provregex1.sh | 6 +++---
test/unittest/pid/tst.provregex2.sh | 10 +++++-----
test/unittest/pid/tst.provregex3.sh | 6 +++---
test/unittest/pid/tst.provregex4.sh | 10 +++++-----
test/unittest/usdt/tst.allargs.sh | 3 +--
test/unittest/usdt/tst.badguess.sh | 3 +--
test/unittest/usdt/tst.badguess.x | 2 +-
test/unittest/usdt/tst.dlclose1.sh | 3 +--
test/unittest/usdt/tst.dlclose2.sh | 3 +--
test/unittest/usdt/tst.dlclose3.sh | 3 +--
test/unittest/usdt/tst.dlclose4.sh | 3 +--
test/unittest/usdt/tst.eliminate.sh | 7 +++----
test/unittest/usdt/tst.enable_pid.sh | 7 +++----
test/unittest/usdt/tst.enabled.sh | 3 +--
test/unittest/usdt/tst.enabled2.sh | 3 +--
test/unittest/usdt/tst.entryreturn.sh | 3 +--
test/unittest/usdt/tst.exec-dof-replacement.sh | 3 +--
test/unittest/usdt/tst.execstack.sh | 5 +----
test/unittest/usdt/tst.fork.sh | 3 +--
test/unittest/usdt/tst.guess32.sh | 3 +--
test/unittest/usdt/tst.guess64.sh | 3 +--
test/unittest/usdt/tst.header.sh | 3 +--
test/unittest/usdt/tst.lingering.sh | 3 +--
test/unittest/usdt/tst.link-idempotence.sh | 3 +--
test/unittest/usdt/tst.linkpriv.sh | 3 +--
test/unittest/usdt/tst.linkunpriv.sh | 3 +--
test/unittest/usdt/tst.manyprobes.sh | 3 +--
test/unittest/usdt/tst.manyprocs.sh | 3 +--
test/unittest/usdt/tst.multiple.sh | 3 +--
test/unittest/usdt/tst.multiprov-dupprobe-shlibs.sh | 3 +--
test/unittest/usdt/tst.multitrace.sh | 3 +--
test/unittest/usdt/tst.nusdtprobes.sh | 6 +++---
test/unittest/usdt/tst.onlyenabled.sh | 3 +--
test/unittest/usdt/tst.pidprobes.sh | 12 ++++++------
test/unittest/usdt/tst.pie.sh | 3 +--
test/unittest/usdt/tst.reeval.sh | 3 +--
test/unittest/usdt/tst.static.sh | 3 +--
test/unittest/usdt/tst.static2.sh | 3 +--
test/unittest/usdt/tst.user.sh | 3 +--
test/utils/workload_analyze_loop.sh | 4 ++--
65 files changed, 109 insertions(+), 153 deletions(-)
diff --git a/runtest.sh b/runtest.sh
index 15bd78fb6..156e7dec8 100755
--- a/runtest.sh
+++ b/runtest.sh
@@ -653,6 +653,11 @@ load_modules
# Export some variables so triggers and .sh scripts can get at them.
export _test _pid dt_flags
+export CC=${CC:-/usr/bin/gcc}
+export NM=${NM:-/usr/bin/nm}
+export OBJCOPY=${OBJCOPY:-/usr/bin/objcopy}
+export OBJDUMP=${OBJDUMP:-/usr/bin/objdump}
+export READELF=${READELF:-/usr/bin/readelf}
# Arrange to do (relatively expensive) mutex debugging.
export DTRACE_OPT_DEBUGASSERT="mutexes"
diff --git a/test/expensive/locking/tst.DestructionDoubleUnlock.sh b/test/expensive/locking/tst.DestructionDoubleUnlock.sh
index c9b9eadcd..b7118642b 100755
--- a/test/expensive/locking/tst.DestructionDoubleUnlock.sh
+++ b/test/expensive/locking/tst.DestructionDoubleUnlock.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -28,7 +28,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS=
DIRNAME="$tmpdir/destruction-double-unlock.$$.$RANDOM"
diff --git a/test/internals/headers/tst.header-endianness.sh b/test/internals/headers/tst.header-endianness.sh
index e45cc5970..227da854e 100755
--- a/test/internals/headers/tst.header-endianness.sh
+++ b/test/internals/headers/tst.header-endianness.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -10,7 +10,6 @@
set -e
dtrace=$1
-CC=/usr/bin/gcc
OLDDIRNAME=${PWD}
CFLAGS="-I${OLDDIRNAME}/include -I${OLDDIRNAME}/uts/common"
diff --git a/test/stress/options/tst.cpu-syscall.sh b/test/stress/options/tst.cpu-syscall.sh
index 6fb09d48b..3f6f2f481 100755
--- a/test/stress/options/tst.cpu-syscall.sh
+++ b/test/stress/options/tst.cpu-syscall.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -91,7 +91,7 @@ int main(int c, char **v) {
}
EOF
-gcc main.c
+$CC main.c
if [ $? -ne 0 ]; then
echo ERROR compilation failed
exit 1
diff --git a/test/unittest/aggs/tst.aggmod_full2.sh b/test/unittest/aggs/tst.aggmod_full2.sh
index 66cfc002b..b87d6ba68 100755
--- a/test/unittest/aggs/tst.aggmod_full2.sh
+++ b/test/unittest/aggs/tst.aggmod_full2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -17,7 +17,6 @@
##
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS=
DIRNAME="$tmpdir/aggs-aggmod_full2.$$.$RANDOM"
diff --git a/test/unittest/arrays/tst.uregsarray-check.sh b/test/unittest/arrays/tst.uregsarray-check.sh
index f55d36d0d..4f1aabaa8 100755
--- a/test/unittest/arrays/tst.uregsarray-check.sh
+++ b/test/unittest/arrays/tst.uregsarray-check.sh
@@ -1,13 +1,12 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS=
DIRNAME="$tmpdir/arrays-uregsarray-check.$$.$RANDOM"
diff --git a/test/unittest/bitfields/tst.bitfield-offset.x b/test/unittest/bitfields/tst.bitfield-offset.x
index ae57c2b56..1f328c23c 100755
--- a/test/unittest/bitfields/tst.bitfield-offset.x
+++ b/test/unittest/bitfields/tst.bitfield-offset.x
@@ -12,8 +12,8 @@
# skip the test, since we can't possibly tell what it was
# generated by.
-if ! objdump --ctf=.ctf --ctf-parent=shared_ctf /bin/true > /dev/null 2>&1 && \
- LANG=C objdump --ctf=.ctf --ctf-parent=shared_ctf /bin/true 2>&1 | \
+if ! ${OBJDUMP} --ctf=.ctf --ctf-parent=shared_ctf /bin/true > /dev/null 2>&1 && \
+ LANG=C ${OBJDUMP} --ctf=.ctf --ctf-parent=shared_ctf /bin/true 2>&1 | \
grep 'unrecognized option' > /dev/null 2>&1; then
exit 2
fi
@@ -21,7 +21,7 @@ fi
ctfa=$tmpdir/vmlinux.ctfa
trap "rm -f $ctfa" EXIT ERR
-objcopy --add-section=.ctf=/lib/modules/$(uname -r)/kernel/vmlinux.ctfa /bin/true $ctfa
+${OBJCOPY} --add-section=.ctf=/lib/modules/$(uname -r)/kernel/vmlinux.ctfa /bin/true $ctfa
-objdump --ctf=.ctf --ctf-parent=shared_ctf $ctfa |\
+${OBJDUMP} --ctf=.ctf --ctf-parent=shared_ctf $ctfa |\
gawk '/Version: 3/ { exit 1; } /Version: / { exit 0; }'
diff --git a/test/unittest/builtinvar/tst.errno3.sh b/test/unittest/builtinvar/tst.errno3.sh
index 7546152f6..d1bcde391 100755
--- a/test/unittest/builtinvar/tst.errno3.sh
+++ b/test/unittest/builtinvar/tst.errno3.sh
@@ -1,13 +1,12 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
dtrace=$1
-CC=/usr/bin/gcc
DIRNAME="$tmpdir/builtinvar-errno3.$$.$RANDOM"
mkdir -p $DIRNAME
diff --git a/test/unittest/builtinvar/tst.tid_pid.sh b/test/unittest/builtinvar/tst.tid_pid.sh
index 7ff0227fe..e367411dc 100755
--- a/test/unittest/builtinvar/tst.tid_pid.sh
+++ b/test/unittest/builtinvar/tst.tid_pid.sh
@@ -7,7 +7,6 @@
#
dtrace=$1
-CC=/usr/bin/gcc
DIRNAME="$tmpdir/builtinvar-tid_pid.$$.$RANDOM"
mkdir -p $DIRNAME
diff --git a/test/unittest/dtrace-util/tst.ListProbesArgsUSDT.sh b/test/unittest/dtrace-util/tst.ListProbesArgsUSDT.sh
index 737f2cc88..945d21882 100755
--- a/test/unittest/dtrace-util/tst.ListProbesArgsUSDT.sh
+++ b/test/unittest/dtrace-util/tst.ListProbesArgsUSDT.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
@@ -20,7 +20,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS=
DIRNAME="$tmpdir/list-probes-args-usdt.$$.$RANDOM"
diff --git a/test/unittest/dtrace-util/tst.ListProbesFuncUSDT.sh b/test/unittest/dtrace-util/tst.ListProbesFuncUSDT.sh
index f8083f2c9..e7af9da9d 100755
--- a/test/unittest/dtrace-util/tst.ListProbesFuncUSDT.sh
+++ b/test/unittest/dtrace-util/tst.ListProbesFuncUSDT.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -22,7 +22,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS=
DIRNAME="$tmpdir/list-probes-func-usdt.$$.$RANDOM"
diff --git a/test/unittest/dtrace-util/tst.ListProbesModuleUSDT.sh b/test/unittest/dtrace-util/tst.ListProbesModuleUSDT.sh
index dc6cb1008..f66d6cbdd 100755
--- a/test/unittest/dtrace-util/tst.ListProbesModuleUSDT.sh
+++ b/test/unittest/dtrace-util/tst.ListProbesModuleUSDT.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -22,7 +22,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS=
DIRNAME="$tmpdir/list-probes-module-usdt.$$.$RANDOM"
diff --git a/test/unittest/dtrace-util/tst.ListProbesNameUSDT.sh b/test/unittest/dtrace-util/tst.ListProbesNameUSDT.sh
index 59b8dca56..9f6ca8bab 100755
--- a/test/unittest/dtrace-util/tst.ListProbesNameUSDT.sh
+++ b/test/unittest/dtrace-util/tst.ListProbesNameUSDT.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -22,7 +22,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS=
DIRNAME="$tmpdir/list-probes-name-usdt.$$.$RANDOM"
diff --git a/test/unittest/dtrace-util/tst.ListProbesProviderUSDT.sh b/test/unittest/dtrace-util/tst.ListProbesProviderUSDT.sh
index 64fc185da..be6d87be2 100755
--- a/test/unittest/dtrace-util/tst.ListProbesProviderUSDT.sh
+++ b/test/unittest/dtrace-util/tst.ListProbesProviderUSDT.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -22,7 +22,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS=
DIRNAME="$tmpdir/list-probes-provider-usdt.$$.$RANDOM"
diff --git a/test/unittest/fbtprovider/tst.entryargs2.sh b/test/unittest/fbtprovider/tst.entryargs2.sh
index f5b435f56..4485d33a8 100755
--- a/test/unittest/fbtprovider/tst.entryargs2.sh
+++ b/test/unittest/fbtprovider/tst.entryargs2.sh
@@ -9,7 +9,6 @@
#
dtrace=$1
-CC=${CC:-/usr/bin/gcc}
# Set up test directory.
diff --git a/test/unittest/funcs/copyout/tst.copyout.sh b/test/unittest/funcs/copyout/tst.copyout.sh
index 748b138b8..9553938bc 100755
--- a/test/unittest/funcs/copyout/tst.copyout.sh
+++ b/test/unittest/funcs/copyout/tst.copyout.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
@@ -31,7 +31,7 @@ int main(int c, char **v) {
}
EOF
-gcc main.c
+$CC main.c
if [ $? -ne 0 ]; then
echo "compilation error"
exit 1
diff --git a/test/unittest/funcs/copyoutstr/tst.copyoutstr.sh b/test/unittest/funcs/copyoutstr/tst.copyoutstr.sh
index d98897fcc..284478b06 100755
--- a/test/unittest/funcs/copyoutstr/tst.copyoutstr.sh
+++ b/test/unittest/funcs/copyoutstr/tst.copyoutstr.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
@@ -42,7 +42,7 @@ int main(int c, char **v) {
}
EOF
-gcc main.c
+$CC main.c
if [ $? -ne 0 ]; then
echo "compilation error"
exit 1
diff --git a/test/unittest/misc/tst.include.sh b/test/unittest/misc/tst.include.sh
index 9d9989a3e..4cdacfe91 100755
--- a/test/unittest/misc/tst.include.sh
+++ b/test/unittest/misc/tst.include.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -13,7 +13,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS=
DIR="$tmpdir/misc-include.$$.$RANDOM"
diff --git a/test/unittest/options/tst.cpu-syscall.sh b/test/unittest/options/tst.cpu-syscall.sh
index 401839d56..4fb58c35f 100755
--- a/test/unittest/options/tst.cpu-syscall.sh
+++ b/test/unittest/options/tst.cpu-syscall.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -91,7 +91,7 @@ int main(int c, char **v) {
}
EOF
-gcc main.c
+$CC main.c
if [ $? -ne 0 ]; then
echo ERROR compilation failed
exit 1
diff --git a/test/unittest/options/tst.ctypes.sh b/test/unittest/options/tst.ctypes.sh
index 30a6c9b16..767de0db0 100755
--- a/test/unittest/options/tst.ctypes.sh
+++ b/test/unittest/options/tst.ctypes.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -14,14 +14,14 @@ if [ ! -r $tmpdir/ctypes.ctf ]; then
exit 1
fi
-if objdump --help | grep ctf >/dev/null; then
- objcopy --add-section=.ctf=$tmpdir/ctypes.ctf /bin/true $tmpdir/ctypes.o
+if ${OBJDUMP} --help | grep ctf >/dev/null; then
+ ${OBJCOPY} --add-section=.ctf=$tmpdir/ctypes.ctf /bin/true $tmpdir/ctypes.o
if [ $? -ne 0 ]; then
echo "ERROR: Failed to create ELF object from ctypes.ctf"
exit 1
fi
- objdump --ctf=.ctf $tmpdir/ctypes.o | \
+ ${OBJDUMP} --ctf=.ctf $tmpdir/ctypes.o | \
gawk '/CTF_VERSION/ { found = 1; next; }
found && $1 ~ /0x[0-9A-Fa-f]+:/ { cnt++; next; }
END { print "C CTF data" (found ? " " : " NOT ") "found";
diff --git a/test/unittest/options/tst.dtypes.sh b/test/unittest/options/tst.dtypes.sh
index 441de098a..ac6a8036d 100755
--- a/test/unittest/options/tst.dtypes.sh
+++ b/test/unittest/options/tst.dtypes.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -14,14 +14,14 @@ if [ ! -r $tmpdir/dtypes.ctf ]; then
exit 1
fi
-if objdump --help | grep ctf >/dev/null; then
- objcopy --add-section=.ctf=$tmpdir/dtypes.ctf /bin/true $tmpdir/dtypes.o
+if ${OBJDUMP} --help | grep ctf >/dev/null; then
+ ${OBJCOPY} --add-section=.ctf=$tmpdir/dtypes.ctf /bin/true $tmpdir/dtypes.o
if [ $? -ne 0 ]; then
echo "ERROR: Failed to create ELF object from dtypes.ctf"
exit 1
fi
- objdump --ctf=.ctf $tmpdir/dtypes.o | \
+ ${OBJDUMP} --ctf=.ctf $tmpdir/dtypes.o | \
gawk '/CTF_VERSION/ { found = 1; next; }
found && $1 ~ /0x[0-9A-Fa-f]+:/ { cnt++; next; }
END { print "D CTF data" (found ? " " : " NOT ") "found";
diff --git a/test/unittest/options/tst.linktype.sh b/test/unittest/options/tst.linktype.sh
index 564d9b0f6..7298d67a7 100755
--- a/test/unittest/options/tst.linktype.sh
+++ b/test/unittest/options/tst.linktype.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -9,7 +9,6 @@
# @@nosort
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS=
DIRNAME="$tmpdir/linktype.$$.$RANDOM"
@@ -61,7 +60,7 @@ function mytest() {
fi
# report whether the file format is recognized
- objdump --file-headers prov.o |& gawk '
+ ${OBJDUMP} --file-headers prov.o |& gawk '
/format not recognized/ {
print "objdump does NOT recognize file format";
exit(0);
diff --git a/test/unittest/options/tst.strip.sh b/test/unittest/options/tst.strip.sh
index 054955fb3..f7960d7a6 100755
--- a/test/unittest/options/tst.strip.sh
+++ b/test/unittest/options/tst.strip.sh
@@ -1,13 +1,12 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS=
DIRNAME="$tmpdir/strip.$$.$RANDOM"
@@ -48,7 +47,7 @@ fi
# link with and without -xstrip, dumping the DOF section
-objdump="objdump --full-contents --section=.SUNW_dof prov.o"
+objdump="${OBJDUMP} --full-contents --section=.SUNW_dof prov.o"
$dtrace $dt_flags -G -xstrip -s prov.d test.o
if [ $? -ne 0 ]; then
diff --git a/test/unittest/pid/tst.dash.sh b/test/unittest/pid/tst.dash.sh
index f364e3e3c..0289b6093 100755
--- a/test/unittest/pid/tst.dash.sh
+++ b/test/unittest/pid/tst.dash.sh
@@ -54,7 +54,7 @@ int main(int c, char **v) {
}
EOF
-gcc main.c
+$CC main.c
if [ $? -ne 0 ]; then
echo ERROR compile
exit 1
@@ -66,7 +66,7 @@ for func in foo0 foo1 foo2 main; do
# For each function, get the absolute and relative
# (to the function) address of some instruction in
# the function.
- read ABS REL <<< `objdump -d a.out | awk '
+ read ABS REL <<< `$OBJDUMP -d a.out | awk '
# Look for the function.
/^[0-9a-f]* <'$func'>:$/ {
diff --git a/test/unittest/pid/tst.offsets.sh b/test/unittest/pid/tst.offsets.sh
index cc1a440d5..23aad6202 100755
--- a/test/unittest/pid/tst.offsets.sh
+++ b/test/unittest/pid/tst.offsets.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -54,7 +54,7 @@ main(int c, char **v)
}
EOF
-gcc main.c
+$CC main.c
if [ $? -ne 0 ]; then
echo ERROR in compiling
exit 1
@@ -85,7 +85,7 @@ fi
# hot and cold instructions in the function.
#
-objdump -d a.out | gawk '
+${OBJDUMP} -d a.out | gawk '
BEGIN {
pc0 = 0; # First PC of loopfunc()
pcjump = 0; # PC of the jump
diff --git a/test/unittest/pid/tst.provregex1.sh b/test/unittest/pid/tst.provregex1.sh
index c672b23fa..5bc0bd510 100755
--- a/test/unittest/pid/tst.provregex1.sh
+++ b/test/unittest/pid/tst.provregex1.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -23,10 +23,10 @@ cat > $DIR/Makefile <<EOF
all: main
main: main.o
- cc -o main main.o
+ $CC -o main main.o
main.o: main.c
- cc -c main.c
+ $CC -c main.c
EOF
cat > $DIR/main.c <<EOF
diff --git a/test/unittest/pid/tst.provregex2.sh b/test/unittest/pid/tst.provregex2.sh
index 305aafe99..890836d9c 100755
--- a/test/unittest/pid/tst.provregex2.sh
+++ b/test/unittest/pid/tst.provregex2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -24,16 +24,16 @@ cat > $DIR/Makefile <<EOF
all: main altlib.so
main: main.o
- cc -o main main.o -ldl
+ $CC -o main main.o -ldl
main.o: main.c
- cc -c main.c
+ $CC -c main.c
altlib.so: altlib.o
- cc -z defs -shared -o altlib.so altlib.o
+ $CC -z defs -shared -o altlib.so altlib.o
altlib.o: altlib.c
- cc -c altlib.c
+ $CC -c altlib.c
EOF
cat > $DIR/altlib.c <<EOF
diff --git a/test/unittest/pid/tst.provregex3.sh b/test/unittest/pid/tst.provregex3.sh
index 41210ff09..bc7908eb1 100755
--- a/test/unittest/pid/tst.provregex3.sh
+++ b/test/unittest/pid/tst.provregex3.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -23,10 +23,10 @@ cat > $DIR/Makefile <<EOF
all: main
main: main.o prov.o
- cc $test_cppflags -o main main.o prov.o
+ $CC $test_cppflags -o main main.o prov.o
main.o: main.c prov.h
- cc $test_cppflags -c main.c
+ $CC $test_cppflags -c main.c
prov.h: prov.d
$dtrace $dt_flags -h -s prov.d
diff --git a/test/unittest/pid/tst.provregex4.sh b/test/unittest/pid/tst.provregex4.sh
index 5aa38fa98..0e405d3a5 100755
--- a/test/unittest/pid/tst.provregex4.sh
+++ b/test/unittest/pid/tst.provregex4.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -25,10 +25,10 @@ cat > $DIR/Makefile <<EOF
all: main altlib.so
main: main.o provmain.o
- cc $test_cppflags -o main main.o provmain.o -ldl
+ $CC $test_cppflags -o main main.o provmain.o -ldl
main.o: main.c prov.h
- cc $test_cppflags -c main.c
+ $CC $test_cppflags -c main.c
prov.h: prov.d
$dtrace $dt_flags -h -s prov.d
@@ -37,10 +37,10 @@ provmain.o: prov.d main.o
$dtrace $dt_flags -G -o provmain.o -s prov.d main.o
altlib.so: altlib.o provalt.o
- cc $test_cppflags -z defs --shared -o altlib.so altlib.o provalt.o
+ $CC $test_cppflags -z defs --shared -o altlib.so altlib.o provalt.o
altlib.o: altlib.c prov.h
- cc $test_cppflags -c altlib.c
+ $CC $test_cppflags -c altlib.c
provalt.o: prov.d altlib.o
$dtrace $dt_flags -G -o provalt.o -s prov.d altlib.o
diff --git a/test/unittest/usdt/tst.allargs.sh b/test/unittest/usdt/tst.allargs.sh
index 179552b65..ca2d71886 100755
--- a/test/unittest/usdt/tst.allargs.sh
+++ b/test/unittest/usdt/tst.allargs.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
@@ -15,7 +15,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="-std=gnu89 $test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.badguess.sh b/test/unittest/usdt/tst.badguess.sh
index b6ff9e233..6cd959bbf 100755
--- a/test/unittest/usdt/tst.badguess.sh
+++ b/test/unittest/usdt/tst.badguess.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -11,7 +11,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.badguess.x b/test/unittest/usdt/tst.badguess.x
index d92f8bff5..b4030d55f 100755
--- a/test/unittest/usdt/tst.badguess.x
+++ b/test/unittest/usdt/tst.badguess.x
@@ -4,4 +4,4 @@
#
# If we can't compile a trivial 32-bit program, this test
# will fail.
-echo 'int main (void) { }' | gcc -x c -c -o /dev/null -m32 - 2>/dev/null
+echo 'int main (void) { }' | $CC -x c -c -o /dev/null -m32 - 2>/dev/null
diff --git a/test/unittest/usdt/tst.dlclose1.sh b/test/unittest/usdt/tst.dlclose1.sh
index a6bad02b7..6e2c0da7d 100755
--- a/test/unittest/usdt/tst.dlclose1.sh
+++ b/test/unittest/usdt/tst.dlclose1.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -29,7 +29,6 @@
# The second should not.
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS=
DIRNAME="$tmpdir/usdt-dlclose1.$$.$RANDOM"
diff --git a/test/unittest/usdt/tst.dlclose2.sh b/test/unittest/usdt/tst.dlclose2.sh
index 907685a68..88779fc52 100755
--- a/test/unittest/usdt/tst.dlclose2.sh
+++ b/test/unittest/usdt/tst.dlclose2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -15,7 +15,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS=
DIRNAME="$tmpdir/usdt-dlclose2.$$.$RANDOM"
diff --git a/test/unittest/usdt/tst.dlclose3.sh b/test/unittest/usdt/tst.dlclose3.sh
index 0b70906fc..bcc1e0ed2 100755
--- a/test/unittest/usdt/tst.dlclose3.sh
+++ b/test/unittest/usdt/tst.dlclose3.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -21,7 +21,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS=
DIRNAME="$tmpdir/usdt-dlclose3.$$.$RANDOM"
diff --git a/test/unittest/usdt/tst.dlclose4.sh b/test/unittest/usdt/tst.dlclose4.sh
index a84e34600..9e1a11c49 100755
--- a/test/unittest/usdt/tst.dlclose4.sh
+++ b/test/unittest/usdt/tst.dlclose4.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -15,7 +15,6 @@ PATH=/usr/bin:/usr/sbin:$PATH
#
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS=
DIRNAME="$tmpdir/usdt-dlclose4.$$.$RANDOM"
diff --git a/test/unittest/usdt/tst.eliminate.sh b/test/unittest/usdt/tst.eliminate.sh
index e74896bbe..e9fbf5e99 100755
--- a/test/unittest/usdt/tst.eliminate.sh
+++ b/test/unittest/usdt/tst.eliminate.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
# @@xfail: Linux ld does not seem to support STV_ELIMINATE
@@ -16,7 +16,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
@@ -71,13 +70,13 @@ if [ $? -ne 0 ]; then
exit 1
fi
-nm test.o | grep \$dtrace > /dev/null
+${NM} test.o | grep \$dtrace > /dev/null
if [ $? -ne 0 ]; then
echo "no temporary symbols in the object file" >& 2
exit 1
fi
-nm test | grep \$dtrace > /dev/null
+${NM} test | grep \$dtrace > /dev/null
if [ $? -eq 0 ]; then
echo "failed to eliminate temporary symbols" >& 2
exit 1
diff --git a/test/unittest/usdt/tst.enable_pid.sh b/test/unittest/usdt/tst.enable_pid.sh
index 207184d43..7f4f68698 100755
--- a/test/unittest/usdt/tst.enable_pid.sh
+++ b/test/unittest/usdt/tst.enable_pid.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -14,7 +14,6 @@ PATH=/usr/bin:/usr/sbin:$PATH
#
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS=
DIRNAME="$tmpdir/usdt-enable_pid.$$.$RANDOM"
@@ -120,7 +119,7 @@ if [ $? -ne 0 ]; then
echo "failed to generate header file" >&2
exit 1
fi
-cc $test_cppflags -c main.c
+$CC $test_cppflags -c main.c
if [ $? -ne 0 ]; then
echo "failed to compile test" >&2
exit 1
@@ -130,7 +129,7 @@ if [ $? -ne 0 ]; then
echo "failed to create DOF" >&2
exit 1
fi
-cc $test_cppflags -o main main.o prov.o
+$CC $test_cppflags -o main main.o prov.o
if [ $? -ne 0 ]; then
echo "failed to link final executable" >&2
exit 1
diff --git a/test/unittest/usdt/tst.enabled.sh b/test/unittest/usdt/tst.enabled.sh
index 4cd1eccdb..a180f9622 100755
--- a/test/unittest/usdt/tst.enabled.sh
+++ b/test/unittest/usdt/tst.enabled.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -11,7 +11,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.enabled2.sh b/test/unittest/usdt/tst.enabled2.sh
index 1732085e6..b174ef4c3 100755
--- a/test/unittest/usdt/tst.enabled2.sh
+++ b/test/unittest/usdt/tst.enabled2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -15,7 +15,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.entryreturn.sh b/test/unittest/usdt/tst.entryreturn.sh
index 84af96723..03418e7ba 100755
--- a/test/unittest/usdt/tst.entryreturn.sh
+++ b/test/unittest/usdt/tst.entryreturn.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -13,7 +13,6 @@ fi
# @@xfail: dtv2, no wildcard usdt probes yet
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.exec-dof-replacement.sh b/test/unittest/usdt/tst.exec-dof-replacement.sh
index 6d547cce3..b7ec5f2dc 100755
--- a/test/unittest/usdt/tst.exec-dof-replacement.sh
+++ b/test/unittest/usdt/tst.exec-dof-replacement.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -14,7 +14,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.execstack.sh b/test/unittest/usdt/tst.execstack.sh
index e7b59105b..42da70350 100755
--- a/test/unittest/usdt/tst.execstack.sh
+++ b/test/unittest/usdt/tst.execstack.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -11,11 +11,8 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
-OBJDUMP=/usr/bin/objdump
-READELF=/usr/bin/readelf
DIRNAME="$tmpdir/usdt-execstack.$$.$RANDOM"
mkdir -p $DIRNAME
diff --git a/test/unittest/usdt/tst.fork.sh b/test/unittest/usdt/tst.fork.sh
index 9b2b372a0..e82463f96 100755
--- a/test/unittest/usdt/tst.fork.sh
+++ b/test/unittest/usdt/tst.fork.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -12,7 +12,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.guess32.sh b/test/unittest/usdt/tst.guess32.sh
index 7a130e178..219612368 100755
--- a/test/unittest/usdt/tst.guess32.sh
+++ b/test/unittest/usdt/tst.guess32.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
@@ -11,7 +11,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.guess64.sh b/test/unittest/usdt/tst.guess64.sh
index 23b7a241c..417dcec92 100755
--- a/test/unittest/usdt/tst.guess64.sh
+++ b/test/unittest/usdt/tst.guess64.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -11,7 +11,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.header.sh b/test/unittest/usdt/tst.header.sh
index c5e411be6..521e9fd1f 100755
--- a/test/unittest/usdt/tst.header.sh
+++ b/test/unittest/usdt/tst.header.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -11,7 +11,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.lingering.sh b/test/unittest/usdt/tst.lingering.sh
index 079acb75d..148345cfc 100755
--- a/test/unittest/usdt/tst.lingering.sh
+++ b/test/unittest/usdt/tst.lingering.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -14,7 +14,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.link-idempotence.sh b/test/unittest/usdt/tst.link-idempotence.sh
index 643ba10ca..caa495338 100755
--- a/test/unittest/usdt/tst.link-idempotence.sh
+++ b/test/unittest/usdt/tst.link-idempotence.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -11,7 +11,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.linkpriv.sh b/test/unittest/usdt/tst.linkpriv.sh
index 2c89f5d46..5f637e857 100755
--- a/test/unittest/usdt/tst.linkpriv.sh
+++ b/test/unittest/usdt/tst.linkpriv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -11,7 +11,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="-std=gnu99 $test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.linkunpriv.sh b/test/unittest/usdt/tst.linkunpriv.sh
index 9ef386392..b00d532ea 100755
--- a/test/unittest/usdt/tst.linkunpriv.sh
+++ b/test/unittest/usdt/tst.linkunpriv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -13,7 +13,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
DIRNAME="$tmpdir/usdt-linkunpriv.$$.$RANDOM"
diff --git a/test/unittest/usdt/tst.manyprobes.sh b/test/unittest/usdt/tst.manyprobes.sh
index c0deb8df0..6e894f2cd 100755
--- a/test/unittest/usdt/tst.manyprobes.sh
+++ b/test/unittest/usdt/tst.manyprobes.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -11,7 +11,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
DIRNAME="$tmpdir/usdt-manyprobes.$$.$RANDOM"
diff --git a/test/unittest/usdt/tst.manyprocs.sh b/test/unittest/usdt/tst.manyprocs.sh
index 585503029..e157d05a4 100755
--- a/test/unittest/usdt/tst.manyprocs.sh
+++ b/test/unittest/usdt/tst.manyprocs.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -14,7 +14,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.multiple.sh b/test/unittest/usdt/tst.multiple.sh
index 440a7d7ba..8734a1103 100755
--- a/test/unittest/usdt/tst.multiple.sh
+++ b/test/unittest/usdt/tst.multiple.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -11,7 +11,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.multiprov-dupprobe-shlibs.sh b/test/unittest/usdt/tst.multiprov-dupprobe-shlibs.sh
index 6595737f9..2fc17e586 100755
--- a/test/unittest/usdt/tst.multiprov-dupprobe-shlibs.sh
+++ b/test/unittest/usdt/tst.multiprov-dupprobe-shlibs.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -13,7 +13,6 @@
# @@nosort
dtrace=$1
-CC=/usr/bin/gcc
DIRNAME="$tmpdir/usdt-multiprov-dupprobe-shlibs.$$.$RANDOM"
mkdir -p $DIRNAME
diff --git a/test/unittest/usdt/tst.multitrace.sh b/test/unittest/usdt/tst.multitrace.sh
index 262c78282..81f43f767 100755
--- a/test/unittest/usdt/tst.multitrace.sh
+++ b/test/unittest/usdt/tst.multitrace.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -14,7 +14,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.nusdtprobes.sh b/test/unittest/usdt/tst.nusdtprobes.sh
index f275f921f..93c56e382 100755
--- a/test/unittest/usdt/tst.nusdtprobes.sh
+++ b/test/unittest/usdt/tst.nusdtprobes.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -66,7 +66,7 @@ if [ $? -ne 0 ]; then
echo "failed to generate header file" >&2
exit 1
fi
-gcc $test_cppflags -c main.c
+$CC $test_cppflags -c main.c
if [ $? -ne 0 ]; then
echo "failed to compile test" >&2
exit 1
@@ -76,7 +76,7 @@ if [ $? -ne 0 ]; then
echo "failed to create DOF" >&2
exit 1
fi
-gcc $test_ldflags -o main main.o prov.o
+$CC $test_ldflags -o main main.o prov.o
if [ $? -ne 0 ]; then
echo "failed to link final executable" >&2
exit 1
diff --git a/test/unittest/usdt/tst.onlyenabled.sh b/test/unittest/usdt/tst.onlyenabled.sh
index d3487834e..9db5dc462 100755
--- a/test/unittest/usdt/tst.onlyenabled.sh
+++ b/test/unittest/usdt/tst.onlyenabled.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -11,7 +11,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.pidprobes.sh b/test/unittest/usdt/tst.pidprobes.sh
index 0c75d7967..72434eb96 100755
--- a/test/unittest/usdt/tst.pidprobes.sh
+++ b/test/unittest/usdt/tst.pidprobes.sh
@@ -69,20 +69,20 @@ if [ $? -ne 0 ]; then
echo "failed to generate header file" >&2
exit 1
fi
-cc $test_cppflags -c main.c
+$CC $test_cppflags -c main.c
if [ $? -ne 0 ]; then
echo "failed to compile test" >&2
exit 1
fi
if [[ `uname -m` = "aarch64" ]]; then
- objdump -d main.o > disasm_foo.txt.before
+ $OBJDUMP -d main.o > disasm_foo.txt.before
fi
$dtrace $dt_flags -G -64 -s prov.d main.o
if [ $? -ne 0 ]; then
echo "failed to create DOF" >&2
exit 1
fi
-cc $test_ldflags -o main main.o prov.o
+$CC $test_ldflags -o main main.o prov.o
if [ $? -ne 0 ]; then
echo "failed to link final executable" >&2
exit 1
@@ -104,7 +104,7 @@ fi
# Disassemble foo(). (simplify with --disassemble=foo)
-objdump -d main | awk '
+$OBJDUMP -d main | awk '
BEGIN { use = 0 } # start by not printing lines
use == 1 && NF == 0 { exit } # if printing lines but hit a blank, then exit
use == 1 { print } # print lines
@@ -112,7 +112,7 @@ use == 1 { print } # print lines
' > disasm_foo.txt
if [ $? -ne 0 ]; then
echo cannot objdump main
- objdump -d main
+ $OBJDUMP -d main
exit 1
fi
@@ -277,7 +277,7 @@ done
pc_return=`awk '/'$pid' pid'$pid':main:foo:return/ { print $NF }' dtrace.out`
-objdump -d main | awk '
+$OBJDUMP -d main | awk '
/^[0-9a-f]* <.*>:$/ { myfunc = $NF } # enter a new function
/^ *'$pc_return'/ { print myfunc; exit(0) } # report the function $pc_return is in
' > return_func.out
diff --git a/test/unittest/usdt/tst.pie.sh b/test/unittest/usdt/tst.pie.sh
index 0d62c3762..a2c12a262 100755
--- a/test/unittest/usdt/tst.pie.sh
+++ b/test/unittest/usdt/tst.pie.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -11,7 +11,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="-fno-inline -pie $test_cppflags"
LDFLAGS="-pie $test_ldflags"
diff --git a/test/unittest/usdt/tst.reeval.sh b/test/unittest/usdt/tst.reeval.sh
index 371eee3db..069248f55 100755
--- a/test/unittest/usdt/tst.reeval.sh
+++ b/test/unittest/usdt/tst.reeval.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -12,7 +12,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.static.sh b/test/unittest/usdt/tst.static.sh
index 81b3ba041..dd96b0fff 100755
--- a/test/unittest/usdt/tst.static.sh
+++ b/test/unittest/usdt/tst.static.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -11,7 +11,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.static2.sh b/test/unittest/usdt/tst.static2.sh
index 115a95511..2606ecf33 100755
--- a/test/unittest/usdt/tst.static2.sh
+++ b/test/unittest/usdt/tst.static2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -15,7 +15,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/unittest/usdt/tst.user.sh b/test/unittest/usdt/tst.user.sh
index 30513acca..624897053 100755
--- a/test/unittest/usdt/tst.user.sh
+++ b/test/unittest/usdt/tst.user.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -13,7 +13,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS="$test_cppflags"
LDFLAGS="$test_ldflags"
diff --git a/test/utils/workload_analyze_loop.sh b/test/utils/workload_analyze_loop.sh
index 3bbadf78b..7edce7b02 100755
--- a/test/utils/workload_analyze_loop.sh
+++ b/test/utils/workload_analyze_loop.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
@@ -13,7 +13,7 @@ if [ ! -e $prog ]; then
exit 1
fi
-objdump -d $prog | gawk -v myarch=$(uname -m) '
+${OBJDUMP} -d $prog | gawk -v myarch=$(uname -m) '
# decide whether to track instructions (which we number n = 1, 2, 3, ...) or not (n < 0)
# specifically, do not track instructions until we find the disassembly for <main>
BEGIN { n = -1; }
--
2.43.5
More information about the DTrace-devel
mailing list