git: fdaba0128c17 - main - dtrace tests: Fix nits in some test programs

[Mark Johnston]

The branch main has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=fdaba0128c17ecb3d6e2a458bdc00a7b36a4da51

commit fdaba0128c17ecb3d6e2a458bdc00a7b36a4da51
Author:     Mark Johnston <ma...@freebsd.org>
AuthorDate: 2025-06-04 20:52:16 +0000
Commit:     Mark Johnston <ma...@freebsd.org>
CommitDate: 2025-06-04 20:58:38 +0000

    dtrace tests: Fix nits in some test programs
    
    Otherwise these tests fail spuriously, depending on which compiler is
    installed as cc.
    
    MFC after:      2 weeks
    Sponsored by:   Innovate UK
---
 .../opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh  | 7 ++++---
 .../cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh          | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

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 9620b97cb019..c8f0d1e5f8c0 100644
--- 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
@@ -40,8 +40,8 @@ echo '#pragma D option aggsortkey' >> test.d
 cat > test.c <<EOF
 #include <unistd.h>
 
-void
-main()
+int
+main(void)
 {
 EOF
 
@@ -52,7 +52,7 @@ for oogle in doogle bagnoogle; do
 #include <sys/sdt.h>
 
 void
-$oogle()
+$oogle(void)
 {
        DTRACE_PROBE($oogle, knows);
 }
@@ -79,6 +79,7 @@ EOF
        fi
 
        objs="$objs $oogle.o $oogle.d.o"
+       echo "extern void $oogle(void);" >> test.c
        echo $oogle'();' >> test.c
        echo $oogle'$target:::{@[probefunc] = count()}' >> test.d
 done
diff --git 
a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh
 
b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh
index 2e404f4b8df6..4dd54f3fb633 100644
--- 
a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh
+++ 
b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh
@@ -35,8 +35,8 @@ cd $DIR
 cat > test.c <<EOF
 #include <unistd.h>
 
-void
-main()
+int
+main(void)
 {
 EOF
 
@@ -74,6 +74,7 @@ EOF
        fi
 
        objs="$objs $oogle.o $oogle.d.o"
+       echo "extern void $oogle(void);" >> test.c
        echo $oogle'();' >> test.c
 done