From 56e318aeedc470b768b4a9ffb486e97059dfc7c1 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sun, 21 Apr 2019 17:38:45 -0400 Subject: tests/match_arch.sh, tests/match_plat.sh: Remove tests/arch_is_concerned.sh and tests/plat_is_concerned.sh cover match_arch() and match_plat() already, and match_arch() and match_plat() will soon become "static" functions. --- diff --git a/tests/local.mk b/tests/local.mk index 6eb9878..496e378 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 @@ -25,20 +23,6 @@ tests_resolve_deps_basic_SOURCES = \ 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 \ diff --git a/tests/match_arch.sh b/tests/match_arch.sh deleted file mode 100755 index 2d3693b..0000000 --- a/tests/match_arch.sh +++ /dev/null @@ -1,71 +0,0 @@ -# match_arch() tests -# -# Copyright (C) 2014 Patrick "P. J." McDermott -# -# This file is part of the ProteanOS Development Kit. -# -# The ProteanOS Development Kit is free software: you can redistribute -# it and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# The ProteanOS Development Kit is distributed in the hope that it -# will be useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with the ProteanOS Development Kit. If not, see -# . - -do_test() -{ - local arch="${1}" - local arch_field="${2}" - local result="${3}" - - if match_arch "${arch}" "${arch_field}"; then - if [ "x${result}" = 'xfalse' ]; then - printf 'False positive:\n' - printf ' arch: %s\n arch_field: %s\n' \ - "${arch}" "${arch_field}" - tests_es=1 - fi - else - if [ "x${result}" = 'xtrue' ]; then - printf 'False negative:\n' - printf ' arch: %s\n arch_field: %s\n' \ - "${arch}" "${arch_field}" - tests_es=1 - fi - fi -} - -main() -{ - do_test all 'all' true - - do_test foo-bar-baz 'any' true - - do_test foo-bar-baz 'any all' true - - do_test all 'any all' true - - do_test foo-bar-baz 'foo-bar-baz' true - - do_test foo-bar-baz 'foo-any-any' true - - do_test foo-bar-baz 'foo-bar-qux' false - - do_test foo-bar-baz 'any-qux-any any-bar-any' true - - do_test foo-bar-baz 'any-qux-any any-quux-any' false - - do_test all 'any' false - - do_test any 'all' false - - do_test all 'foo-any-any' false - - return 0 -} diff --git a/tests/match_plat.sh b/tests/match_plat.sh deleted file mode 100755 index 039f76a..0000000 --- a/tests/match_plat.sh +++ /dev/null @@ -1,63 +0,0 @@ -# match_plat() tests -# -# Copyright (C) 2014 Patrick "P. J." McDermott -# -# This file is part of the ProteanOS Development Kit. -# -# The ProteanOS Development Kit is free software: you can redistribute -# it and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# The ProteanOS Development Kit is distributed in the hope that it -# will be useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with the ProteanOS Development Kit. If not, see -# . - -do_test() -{ - local plat="${1}" - local plat_field="${2}" - local result="${3}" - - if match_plat "${plat}" "${plat_field}"; then - if [ "x${result}" = 'xfalse' ]; then - printf 'False positive:\n' - printf ' plat: %s\n plat_field: %s\n' \ - "${plat}" "${plat_field}" - tests_es=1 - fi - else - if [ "x${result}" = 'xtrue' ]; then - printf 'False negative:\n' - printf ' plat: %s\n plat_field: %s\n' \ - "${plat}" "${plat_field}" - tests_es=1 - fi - fi -} - -main() -{ - do_test all 'all' true - - do_test dev 'any' true - - do_test dev 'any all' true - - do_test all 'any all' true - - do_test dev 'dev' true - - do_test dev 'ao751h' false - - do_test all 'any' false - - do_test any 'all' false - - return 0 -} -- cgit v0.9.1