From b7d91b490c1f00d136956695951f581a984d3fa4 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 6 Nov 2013 11:52:02 +0100
Subject: [PATCH] Move libxbps shell tests to libxbps/shell and remove unused
 test-shell.mk.

---
 mk/test-shell.mk                              | 22 -------------------
 tests/xbps/libxbps/Makefile                   |  5 +----
 tests/xbps/libxbps/conf_files/Makefile        |  7 ------
 tests/xbps/libxbps/issue18/Makefile           |  7 ------
 tests/xbps/libxbps/issue20/Makefile           |  7 ------
 tests/xbps/libxbps/issue6/Makefile            |  7 ------
 tests/xbps/libxbps/shell/Makefile             |  7 ++++++
 .../{conf_files => shell}/conf_files_test.sh  |  0
 .../{issue18 => shell}/issue18_test.sh        |  0
 .../{issue20 => shell}/issue20_test.sh        |  0
 .../libxbps/{issue6 => shell}/issue6_test.sh  |  0
 11 files changed, 8 insertions(+), 54 deletions(-)
 delete mode 100644 mk/test-shell.mk
 delete mode 100644 tests/xbps/libxbps/conf_files/Makefile
 delete mode 100644 tests/xbps/libxbps/issue18/Makefile
 delete mode 100644 tests/xbps/libxbps/issue20/Makefile
 delete mode 100644 tests/xbps/libxbps/issue6/Makefile
 create mode 100644 tests/xbps/libxbps/shell/Makefile
 rename tests/xbps/libxbps/{conf_files => shell}/conf_files_test.sh (100%)
 rename tests/xbps/libxbps/{issue18 => shell}/issue18_test.sh (100%)
 rename tests/xbps/libxbps/{issue20 => shell}/issue20_test.sh (100%)
 rename tests/xbps/libxbps/{issue6 => shell}/issue6_test.sh (100%)

diff --git a/mk/test-shell.mk b/mk/test-shell.mk
deleted file mode 100644
index 2ae994f8..00000000
--- a/mk/test-shell.mk
+++ /dev/null
@@ -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)
diff --git a/tests/xbps/libxbps/Makefile b/tests/xbps/libxbps/Makefile
index 14c17530..6ec2673a 100644
--- a/tests/xbps/libxbps/Makefile
+++ b/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
diff --git a/tests/xbps/libxbps/conf_files/Makefile b/tests/xbps/libxbps/conf_files/Makefile
deleted file mode 100644
index 835a7611..00000000
--- a/tests/xbps/libxbps/conf_files/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-TOPDIR = ../../../..
--include $(TOPDIR)/config.mk
-
-TEST = conf_files_test
-
-include ../Makefile.inc
-include $(TOPDIR)/mk/test-shell.mk
diff --git a/tests/xbps/libxbps/issue18/Makefile b/tests/xbps/libxbps/issue18/Makefile
deleted file mode 100644
index 34ebb055..00000000
--- a/tests/xbps/libxbps/issue18/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-TOPDIR = ../../../..
--include $(TOPDIR)/config.mk
-
-TEST = issue18_test
-
-include ../Makefile.inc
-include $(TOPDIR)/mk/test-shell.mk
diff --git a/tests/xbps/libxbps/issue20/Makefile b/tests/xbps/libxbps/issue20/Makefile
deleted file mode 100644
index 0cde5cc4..00000000
--- a/tests/xbps/libxbps/issue20/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-TOPDIR = ../../../..
--include $(TOPDIR)/config.mk
-
-TEST = issue20_test
-
-include ../Makefile.inc
-include $(TOPDIR)/mk/test-shell.mk
diff --git a/tests/xbps/libxbps/issue6/Makefile b/tests/xbps/libxbps/issue6/Makefile
deleted file mode 100644
index cfe754f7..00000000
--- a/tests/xbps/libxbps/issue6/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-TOPDIR = ../../../..
--include $(TOPDIR)/config.mk
-
-TEST = issue6_test
-
-include ../Makefile.inc
-include $(TOPDIR)/mk/test-shell.mk
diff --git a/tests/xbps/libxbps/shell/Makefile b/tests/xbps/libxbps/shell/Makefile
new file mode 100644
index 00000000..7e077fd0
--- /dev/null
+++ b/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
diff --git a/tests/xbps/libxbps/conf_files/conf_files_test.sh b/tests/xbps/libxbps/shell/conf_files_test.sh
similarity index 100%
rename from tests/xbps/libxbps/conf_files/conf_files_test.sh
rename to tests/xbps/libxbps/shell/conf_files_test.sh
diff --git a/tests/xbps/libxbps/issue18/issue18_test.sh b/tests/xbps/libxbps/shell/issue18_test.sh
similarity index 100%
rename from tests/xbps/libxbps/issue18/issue18_test.sh
rename to tests/xbps/libxbps/shell/issue18_test.sh
diff --git a/tests/xbps/libxbps/issue20/issue20_test.sh b/tests/xbps/libxbps/shell/issue20_test.sh
similarity index 100%
rename from tests/xbps/libxbps/issue20/issue20_test.sh
rename to tests/xbps/libxbps/shell/issue20_test.sh
diff --git a/tests/xbps/libxbps/issue6/issue6_test.sh b/tests/xbps/libxbps/shell/issue6_test.sh
similarity index 100%
rename from tests/xbps/libxbps/issue6/issue6_test.sh
rename to tests/xbps/libxbps/shell/issue6_test.sh