From d841dc0bfb1d18a2f85f76096d4aebc4d772b88e Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Mon, 22 Apr 2019 01:48:57 -0400
Subject: Merge branch 'feature/tap-tests'

---
(limited to 'tests/local.mk')

diff --git a/tests/local.mk b/tests/local.mk
index 6eb9878..42ac039 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -1,8 +1,6 @@
 check_PROGRAMS = \
 	tests/parse_control.basic \
 	tests/resolve_deps.basic \
-	tests/match_arch \
-	tests/match_plat \
 	tests/arch_is_concerned \
 	tests/plat_is_concerned \
 	tests/reduce_deps
@@ -12,7 +10,9 @@ TESTS = $(check_PROGRAMS)
 tests_parse_control_basic_SOURCES = \
 	tests/parse_control.basic.sh \
 	tests/parse_control.common.sh \
-	tests/common.sh \
+	tests/aux/common.sh \
+	tests/aux/tap-functions.sh \
+	src/locale.sh \
 	src/output.sh \
 	src/control.sh
 tests_parse_control_basic_LDADD = $(tests_parse_control_basic_SOURCES:.sh=.sho)
@@ -20,42 +20,29 @@ CLEANFILES += $(tests_parse_control_basic_LDADD)
 
 tests_resolve_deps_basic_SOURCES = \
 	tests/resolve_deps.basic.sh \
-	tests/common.sh \
+	tests/aux/common.sh \
+	tests/aux/tap-functions.sh \
 	src/deps.sh
 tests_resolve_deps_basic_LDADD = $(tests_resolve_deps_basic_SOURCES:.sh=.sho)
 CLEANFILES += $(tests_resolve_deps_basic_LDADD)
 
-tests_match_arch_SOURCES = \
-	tests/match_arch.sh \
-	tests/common.sh \
-	src/archplat.sh
-tests_match_arch_LDADD = $(tests_match_arch_SOURCES:.sh=.sho)
-CLEANFILES += $(tests_match_arch_LDADD)
-
-tests_match_plat_SOURCES = \
-	tests/match_plat.sh \
-	tests/common.sh \
-	src/archplat.sh
-tests_match_plat_LDADD = $(tests_match_plat_SOURCES:.sh=.sho)
-CLEANFILES += $(tests_match_plat_LDADD)
-
 tests_arch_is_concerned_SOURCES = \
 	tests/arch_is_concerned.sh \
-	tests/common.sh \
+	tests/aux/tap-functions.sh \
 	src/archplat.sh
 tests_arch_is_concerned_LDADD = $(tests_arch_is_concerned_SOURCES:.sh=.sho)
 CLEANFILES += $(tests_arch_is_concerned_LDADD)
 
 tests_plat_is_concerned_SOURCES = \
 	tests/plat_is_concerned.sh \
-	tests/common.sh \
+	tests/aux/tap-functions.sh \
 	src/archplat.sh
 tests_plat_is_concerned_LDADD = $(tests_plat_is_concerned_SOURCES:.sh=.sho)
 CLEANFILES += $(tests_plat_is_concerned_LDADD)
 
 tests_reduce_deps_SOURCES = \
 	tests/reduce_deps.sh \
-	tests/common.sh \
+	tests/aux/tap-functions.sh \
 	src/deps.sh \
 	src/archplat.sh
 tests_reduce_deps_LDADD = $(tests_reduce_deps_SOURCES:.sh=.sho)
--
cgit v0.9.1