Move libxbps shell tests to libxbps/shell and remove unused test-shell.mk.

mk/test-shell.mk

@@ -1,22 +0,0 @@
--include $(TOPDIR)/config.mk
-
-.PHONY: all
-all: $(TEST)
-
-.PHONY: clean
-clean:
-	-rm -f $(TEST)
-
-.PHONY: install
-install: all
-	install -d $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)
-	install -m755 $(TEST).sh $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)/$(TEST)
-ifdef EXTRA_FILES
-	for f in $(EXTRA_FILES); do \
-		install -m644 $${f} $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR); \
-	done
-endif
-
-.PHONY: uninstall
-uninstall:
-	-rm -f $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)/$(TEST)

tests/xbps/libxbps/Makefile

@@ -10,9 +10,6 @@ SUBDIRS += util
 SUBDIRS += find_pkg_obsoletes
 SUBDIRS += find_pkg_orphans
 SUBDIRS += pkgdb
-SUBDIRS += issue6
-SUBDIRS += issue18
-SUBDIRS += issue20
-SUBDIRS += conf_files
+SUBDIRS += shell
 
 include ../../../mk/subdir.mk

tests/xbps/libxbps/conf_files/Makefile

@@ -1,7 +0,0 @@
-TOPDIR = ../../../..
--include $(TOPDIR)/config.mk
-
-TEST = conf_files_test
-
-include ../Makefile.inc
-include $(TOPDIR)/mk/test-shell.mk

tests/xbps/libxbps/issue18/Makefile

@@ -1,7 +0,0 @@
-TOPDIR = ../../../..
--include $(TOPDIR)/config.mk
-
-TEST = issue18_test
-
-include ../Makefile.inc
-include $(TOPDIR)/mk/test-shell.mk

tests/xbps/libxbps/issue20/Makefile

@@ -1,7 +0,0 @@
-TOPDIR = ../../../..
--include $(TOPDIR)/config.mk
-
-TEST = issue20_test
-
-include ../Makefile.inc
-include $(TOPDIR)/mk/test-shell.mk

tests/xbps/libxbps/issue6/Makefile

@@ -1,7 +0,0 @@
-TOPDIR = ../../../..
--include $(TOPDIR)/config.mk
-
-TEST = issue6_test
-
-include ../Makefile.inc
-include $(TOPDIR)/mk/test-shell.mk

tests/xbps/libxbps/shell/Makefile

@@ -0,0 +1,7 @@
+TOPDIR = ../../../..
+-include $(TOPDIR)/config.mk
+
+TESTSHELL = conf_files_test issue6_test issue18_test issue20_test
+
+include ../Makefile.inc
+include $(TOPDIR)/mk/test.mk