[DTrace-devel] [PATCH] Remove obsolete mknames.sh and related test

[Kris Van Hees]

The id-to-name mapping in dt_names.c (generated by mknames.sh from a
Build rule) is no longer needed.  We therefore no longer need the test
for it either.

Signed-off-by: Kris Van Hees <kris.van.hees at oracle.com>
---
 libdtrace/Build                     |  7 +------
 libdtrace/mknames.sh                | 30 ----------------------------
 test/unittest/disasm/tst.ann-sub.sh | 31 -----------------------------
 3 files changed, 1 insertion(+), 67 deletions(-)
 delete mode 100755 libdtrace/mknames.sh
 delete mode 100755 test/unittest/disasm/tst.ann-sub.sh

diff --git a/libdtrace/Build b/libdtrace/Build
index 055b9546..f1ee0d1c 100644
--- a/libdtrace/Build
+++ b/libdtrace/Build
@@ -35,7 +35,6 @@ libdtrace-build_SOURCES = dt_aggregate.c \
 			  dt_list.c \
 			  dt_map.c \
 			  dt_module.c \
-			  dt_names.c \
 			  dt_open.c \
 			  dt_options.c \
 			  dt_parser.c \
@@ -101,10 +100,6 @@ SHORTKERNELS := $(foreach kernel,$(KERNELS),$(shell printf %s $(kernel) | sed -e
 $(libdtrace-build_DIR)dt_errtags.c: $(libdtrace-build_DIR)dt_errtags.h $(libdtrace-build_DIR)/mkerrtags.sh
 	sh $(libdtrace-build_DIR)mkerrtags.sh < $(libdtrace-build_DIR)dt_errtags.h | sed -e 's/\\n/\n/g' > $@
 
-$(libdtrace-build_DIR)dt_names.c: $(libdtrace-build_DIR)/../include/dtrace/dif_defines.h $(libdtrace-build_DIR)/mknames.sh
-	$(call describe-target,MKNAMES,$(libdtrace-build_DIR)dt_names.c)
-	sh $(libdtrace-build_DIR)mknames.sh < $(libdtrace-build_DIR)/../include/dtrace/dif_defines.h | sed -e 's/\\n/\n/g' > $@
-
 $(libdtrace-build_DIR)%.h $(libdtrace-build_DIR)%.c: $(libdtrace-build_DIR)%.y
 	$(call describe-target,YACC,$(libdtrace-build_DIR)$*.c)
 	bison -o $(libdtrace-build_DIR)$*.c -d $(libdtrace-build_DIR)$*.y
@@ -226,7 +221,7 @@ $(libdtrace-build_DIR)regs.d: $(libdtrace-build_DIR)$(ARCHINC)/regs.d
 
 clean::
 	$(call describe-target,CLEAN,libdtrace)
-	rm -f $(libdtrace-build_DIR)dt_errtags.c $(libdtrace-build_DIR)dt_names.c
+	rm -f $(libdtrace-build_DIR)dt_errtags.c
 	rm -f $(libdtrace-build_DIR)dt_grammar.h $(libdtrace-build_DIR)dt_grammar.c
 	rm -f $(libdtrace-build_DIR)dt_lex.c
 	rm -f $(addprefix $(libdtrace-build_DIR),$(BUILD_DLIBS))
diff --git a/libdtrace/mknames.sh b/libdtrace/mknames.sh
deleted file mode 100755
index 17d0cc2a..00000000
--- a/libdtrace/mknames.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# Oracle Linux DTrace.
-# Copyright (c) 2005, 2020, 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.
-echo "\
-/*\n\
- * Oracle Linux DTrace.\n\
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.\n\
- * Use is subject to license terms.\n\
- */\n\
-\n\
-#include <dtrace.h>\n\
-\n\
-/*ARGSUSED*/
-const char *\n\
-dtrace_subrstr(dtrace_hdl_t *dtp, int subr)\n\
-{\n\
-	switch (subr) {"
-
-awk '
-/^#define[ 	]*DIF_SUBR_/ && $2 != "DIF_SUBR_MAX" {
-	printf("\tcase %s: return \"%s\";\n", $2, tolower(substr($2, 10)));
-}'
-
-echo "\
-	default: return \"unknown\";\n\
-	}\n\
-}"
diff --git a/test/unittest/disasm/tst.ann-sub.sh b/test/unittest/disasm/tst.ann-sub.sh
deleted file mode 100755
index 66f35fa4..00000000
--- a/test/unittest/disasm/tst.ann-sub.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-#
-# Oracle Linux DTrace.
-# Copyright (c) 2013, 2020, 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: dtv2
-
-# ASSERTION:
-#
-# That dtrace -S knows the names of (at least some) DTrace subrs.
-# This guards against silent errors building dt_names.c.
-#
-# We test rand() and d_path() because they are the lowest- and highest-
-# numbered D subrs at the present time.
-
-dtrace=$1
-
-$dtrace $dt_flags -Seq -n 'BEGIN { d_path(0); rand(); }' 2>&1 | tee $tmpdir/dis-subr-names.out
-
-if ! grep -q '! rand' $tmpdir/dis-subr-names.out ||
-   ! grep -q '! d_path' $tmpdir/dis-subr-names.out; then
-    echo 'dtrace -S does not know of d_path() or rand().' >&2
-    exit 1
-fi
-
-if grep -q '! unknown' $tmpdir/dis-subr-names.out; then
-    echo 'dtrace -S mentions unknown subrs.' >&2
-    exit 1
-fi
-- 
2.34.1