Simplify tests/xbps/xbps-rindex structure.

2013-11-06 11:11:00 +01:00
parent 8f36f8e638
commit 6952144d60
8 changed files with 16 additions and 29 deletions
--- a/tests/xbps/xbps-rindex/common/Kyuafile
+++ b/tests/xbps/xbps-rindex/common/Kyuafile
--- a/tests/xbps/xbps-rindex/Makefile
+++ b/tests/xbps/xbps-rindex/Makefile
@@ -1,5 +1,8 @@
-include ../../../config.mk
+TOPDIR = ../../..
+-include $(TOPDIR)/config.mk

-SUBDIRS = common clean
+TESTSHELL = clean_test
+TESTSSUBDIR = xbps/xbps-rindex
+EXTRA_FILES = Kyuafile

-include ../../../mk/subdir.mk
+include $(TOPDIR)/mk/test.mk
--- a/tests/xbps/xbps-rindex/Makefile.inc
+++ b/tests/xbps/xbps-rindex/Makefile.inc
@@ -1 +0,0 @@
-TESTSSUBDIR = xbps/xbps-rindex
--- a/tests/xbps/xbps-rindex/clean/Makefile
+++ b/tests/xbps/xbps-rindex/clean/Makefile
@@ -1,7 +0,0 @@
-TOPDIR = ../../../..
-include $(TOPDIR)/config.mk
-
-TEST = clean_test
-
-include ../Makefile.inc
-include $(TOPDIR)/mk/test-shell.mk
--- a/tests/xbps/xbps-rindex/clean/clean_test.sh
+++ b/tests/xbps/xbps-rindex/clean/clean_test.sh
--- a/tests/xbps/xbps-rindex/common/Makefile
+++ b/tests/xbps/xbps-rindex/common/Makefile
@@ -1,15 +0,0 @@
-TOPDIR = ../../../..
-include $(TOPDIR)/config.mk
-
-include ../Makefile.inc
-
-all:
-
-install:
-	install -d $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)
-	install -m644 Kyuafile $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)
-
-uninstall:
-	-rm -f $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)/Kyuafile
-
-clean: