OS-4551 Want general mergeq (fix debug)

5 files changed, 12 insertions, 24 deletions

diff --git a/usr/src/test/util-tests/runfiles/default.run b/usr/src/test/util-tests/runfiles/default.run
index c8a3f290f1..54f95b7e90 100644
--- a/usr/src/test/util-tests/runfiles/default.run
+++ b/usr/src/test/util-tests/runfiles/default.run
@@ -28,6 +28,9 @@ outputdir = /var/tmp/test_results
 
 [/opt/util-tests/tests/xargs_test]
 
+[/opt/util-tests/tests/mqt]
+[/opt/util-tests/tests/wqt]
+
 [/opt/util-tests/tests/libnvpair_json]
 tests = ['json_00_blank', 'json_01_boolean', 'json_02_numbers',
     'json_03_empty_arrays', 'json_04_number_arrays', 'json_05_strings',
diff --git a/usr/src/test/util-tests/tests/Makefile b/usr/src/test/util-tests/tests/Makefile
index 921e48014c..739b79893f 100644
--- a/usr/src/test/util-tests/tests/Makefile
+++ b/usr/src/test/util-tests/tests/Makefile
@@ -14,6 +14,6 @@
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
 #
 
-SUBDIRS = dladm libnvpair_json printf xargs mergeq
+SUBDIRS = dladm libnvpair_json printf xargs mergeq workq
 
 include $(SRC)/test/Makefile.com
diff --git a/usr/src/test/util-tests/tests/mergeq/Makefile b/usr/src/test/util-tests/tests/mergeq/Makefile
index 168386324e..ef6c6abb99 100644
--- a/usr/src/test/util-tests/tests/mergeq/Makefile
+++ b/usr/src/test/util-tests/tests/mergeq/Makefile
@@ -17,7 +17,6 @@ include $(SRC)/Makefile.master
 
 ROOTOPTPKG = $(ROOT)/opt/util-tests
 TESTDIR = $(ROOTOPTPKG)/tests/mergeq
-ROOTBINDIR = $(ROOTOPTPKG)/bin
 
 PROG = mqt
 OBJS = mqt.o mergeq.o
@@ -26,7 +25,7 @@ include $(SRC)/cmd/Makefile.cmd
 include $(SRC)/cmd/Makefile.ctf
 include $(SRC)/test/Makefile.com
 
-CMDS = $(PROG:%=$(ROOTBINDIR)/%) $(SCRIPTS:%=$(TESTDIR)/%)
+CMDS = $(PROG:%=$(TESTDIR)/%)
 $(CMDS) := FILEMODE = 0555
 
 CPPFLAGS += -I$(SRC)/lib/mergeq -D_REENTRANT
@@ -39,10 +38,10 @@ install: all $(CMDS)
 lint: lint_SRCS
 
 clobber: clean
-	-$(RM) $(PROGS)
+	-$(RM) $(PROG)
 
 clean:
-	-$(RM) *.o
+	-$(RM) $(OBJS)
 
 %.o: %.c
 	$(COMPILE.c) -o $@ -c $<
@@ -58,14 +57,8 @@ $(PROG): $(OBJS)
 
 $(CMDS): $(TESTDIR) $(PROG)
 
-$(ROOTBINDIR):
-	$(INS.dir)
-
-$(ROOTBINDIR)/%: %
-	$(INS.file)
-
 $(TESTDIR):
 	$(INS.dir)
 
-$(TESTDIR)/%: %.ksh
-	$(INS.rename)
+$(TESTDIR)/%: %
+	$(INS.file)
diff --git a/usr/src/test/util-tests/tests/mergeq/mqt.c b/usr/src/test/util-tests/tests/mergeq/mqt.c
index 899970ba83..e61e9173d2 100644
--- a/usr/src/test/util-tests/tests/mergeq/mqt.c
+++ b/usr/src/test/util-tests/tests/mergeq/mqt.c
@@ -63,7 +63,6 @@ mqt_int(void *first, void *second, void **outp, void *arg)
 static int
 mqt_append(void *first, void *second, void **outp, void *arg)
 {
-	int ret;
 	char *out;
 
 	/* Yes, this leaks, don't worry about it for the test */
diff --git a/usr/src/test/util-tests/tests/workq/Makefile b/usr/src/test/util-tests/tests/workq/Makefile
index 1b17ea4f5b..ab5455fd86 100644
--- a/usr/src/test/util-tests/tests/workq/Makefile
+++ b/usr/src/test/util-tests/tests/workq/Makefile
@@ -17,7 +17,6 @@ include $(SRC)/Makefile.master
 
 ROOTOPTPKG = $(ROOT)/opt/util-tests
 TESTDIR = $(ROOTOPTPKG)/tests/mergeq
-ROOTBINDIR = $(ROOTOPTPKG)/bin
 
 PROG = wqt
 OBJS = wqt.o workq.o
@@ -26,7 +25,7 @@ include $(SRC)/cmd/Makefile.cmd
 include $(SRC)/cmd/Makefile.ctf
 include $(SRC)/test/Makefile.com
 
-CMDS = $(PROG:%=$(ROOTBINDIR)/%) $(SCRIPTS:%=$(TESTDIR)/%)
+CMDS = $(PROG:%=$(TESTDIR)/%)
 $(CMDS) := FILEMODE = 0555
 
 CPPFLAGS += -I$(SRC)/lib/mergeq -D_REENTRANT
@@ -58,14 +57,8 @@ $(PROG): $(OBJS)
 
 $(CMDS): $(TESTDIR) $(PROG)
 
-$(ROOTBINDIR):
-	$(INS.dir)
-
-$(ROOTBINDIR)/%: %
-	$(INS.file)
-
 $(TESTDIR):
 	$(INS.dir)
 
-$(TESTDIR)/%: %.ksh
-	$(INS.rename)
+$(TESTDIR)/%: %
+	$(INS.file)