From 3d68fa3d5a8188ecdf55e12391c820e0ae48b4e8 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sat, 22 Dec 2018 13:23:22 -0500 Subject: ob_use(): Remove --- (limited to 'tests') diff --git a/tests/common.sh b/tests/common.sh index 83cb42a..350ae53 100644 --- a/tests/common.sh +++ b/tests/common.sh @@ -19,30 +19,8 @@ BUILDDIR="${PWD}/.." -# The "common" module is used by all library modules. -# We have to manually load the "common" module so we can use it in ob_use. . "${BUILDDIR}/lib/libopkbuild.shso.1" -ob_use() -{ - local module= - - if [ "${#}" -eq 1 ]; then - module="${1}" - else - return 125 - fi - - module="${BUILDDIR}/lib/${module}.sho" - if [ -r "${module}" ]; then - : . "${module}" - else - return 1 - fi - - return 0 -} - test_assert() { eval "${*}" diff --git a/tests/ob_arch_is_concerned.sh b/tests/ob_arch_is_concerned.sh index bd5b1af..9ed9bf8 100644 --- a/tests/ob_arch_is_concerned.sh +++ b/tests/ob_arch_is_concerned.sh @@ -19,8 +19,6 @@ . ./common.sh -ob_use metadata - ret=0 host_arch= arches= diff --git a/tests/ob_match_arch.sh b/tests/ob_match_arch.sh index fe3ef5d..545b2af 100644 --- a/tests/ob_match_arch.sh +++ b/tests/ob_match_arch.sh @@ -19,9 +19,6 @@ . ./common.sh -ob_use metadata -ob_use output - ret=0 arch= arch_field= diff --git a/tests/ob_parse_dep.sh b/tests/ob_parse_dep.sh index 0f04583..2b4a074 100644 --- a/tests/ob_parse_dep.sh +++ b/tests/ob_parse_dep.sh @@ -19,8 +19,6 @@ . ./common.sh -ob_use deps - ret=0 dep= pkg= diff --git a/tests/ob_plat_is_concerned.sh b/tests/ob_plat_is_concerned.sh index 2fa7339..bbde8d6 100644 --- a/tests/ob_plat_is_concerned.sh +++ b/tests/ob_plat_is_concerned.sh @@ -19,8 +19,6 @@ . ./common.sh -ob_use metadata - ret=0 host_plat= plats= diff --git a/tests/ob_reduce_deps.sh b/tests/ob_reduce_deps.sh index 5c725b9..406db0b 100644 --- a/tests/ob_reduce_deps.sh +++ b/tests/ob_reduce_deps.sh @@ -19,8 +19,6 @@ . ./common.sh -ob_use deps - ret=0 type= host_arch= -- cgit v0.9.1