summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2018-12-24 23:44:35 (EST)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2018-12-24 23:44:35 (EST)
commiteed4834e28cf9c252886740915c8327dd538366f (patch)
treed7dd4148d5ea9ecc99a155ff27e94cb15a7d7939
parenta05dd644a2cfb4c3b0219c24e29916d891b6d628 (diff)
Makefile.am, tests/*.sh: Set and use source and build dir env vars
-rw-r--r--Makefile.am2
-rwxr-xr-xtests/ob_arch_is_concerned.sh7
-rwxr-xr-xtests/ob_match_arch.sh7
-rwxr-xr-xtests/ob_parse_dep.sh7
-rwxr-xr-xtests/ob_plat_is_concerned.sh7
-rwxr-xr-xtests/ob_reduce_deps.sh7
6 files changed, 12 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am
index 2212cd3..7ccb1ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,6 +103,8 @@ EXTRA_DIST = \
TEST_EXTENSIONS = .sh
SH_LOG_DRIVER = \
AM_TAP_AWK='$(AWK)' \
+ TOP_SRCDIR="$(top_srcdir)" \
+ TOP_BUILDDIR="$(top_builddir)" \
SHSOEXT='$(SHSOEXT)' \
LIBOPKBUILD_SHSOVERSION='$(libopkbuild_shsoversion)' \
$(SHELL) $(top_srcdir)/build-aux/tap-driver.sh
diff --git a/tests/ob_arch_is_concerned.sh b/tests/ob_arch_is_concerned.sh
index daaff44..c408ef3 100755
--- a/tests/ob_arch_is_concerned.sh
+++ b/tests/ob_arch_is_concerned.sh
@@ -17,11 +17,8 @@
# You should have received a copy of the GNU General Public License
# along with opkbuild. If not, see <http://www.gnu.org/licenses/>.
-srcdir="$(dirname "${0}")"
-top_builddir="${PWD}"
-
-. "${srcdir}/aux/tap-functions.sh"
-. "${top_builddir}/lib/libopkbuild.${SHSOEXT}.${LIBOPKBUILD_SHSOVERSION}"
+. "${TOP_SRCDIR}/tests/aux/tap-functions.sh"
+. "${TOP_BUILDDIR}/lib/libopkbuild.${SHSOEXT}.${LIBOPKBUILD_SHSOVERSION}"
plan_ 12
diff --git a/tests/ob_match_arch.sh b/tests/ob_match_arch.sh
index aa47396..6d6785d 100755
--- a/tests/ob_match_arch.sh
+++ b/tests/ob_match_arch.sh
@@ -17,11 +17,8 @@
# You should have received a copy of the GNU General Public License
# along with opkbuild. If not, see <http://www.gnu.org/licenses/>.
-srcdir="$(dirname "${0}")"
-top_builddir="${PWD}"
-
-. "${srcdir}/aux/tap-functions.sh"
-. "${top_builddir}/lib/libopkbuild.${SHSOEXT}.${LIBOPKBUILD_SHSOVERSION}"
+. "${TOP_SRCDIR}/tests/aux/tap-functions.sh"
+. "${TOP_BUILDDIR}/lib/libopkbuild.${SHSOEXT}.${LIBOPKBUILD_SHSOVERSION}"
plan_ 10
diff --git a/tests/ob_parse_dep.sh b/tests/ob_parse_dep.sh
index edcab0d..1684a3f 100755
--- a/tests/ob_parse_dep.sh
+++ b/tests/ob_parse_dep.sh
@@ -17,11 +17,8 @@
# You should have received a copy of the GNU General Public License
# along with opkbuild. If not, see <http://www.gnu.org/licenses/>.
-srcdir="$(dirname "${0}")"
-top_builddir="${PWD}"
-
-. "${srcdir}/aux/tap-functions.sh"
-. "${top_builddir}/lib/libopkbuild.${SHSOEXT}.${LIBOPKBUILD_SHSOVERSION}"
+. "${TOP_SRCDIR}/tests/aux/tap-functions.sh"
+. "${TOP_BUILDDIR}/lib/libopkbuild.${SHSOEXT}.${LIBOPKBUILD_SHSOVERSION}"
testcase()
{
diff --git a/tests/ob_plat_is_concerned.sh b/tests/ob_plat_is_concerned.sh
index f478610..ea55ce0 100755
--- a/tests/ob_plat_is_concerned.sh
+++ b/tests/ob_plat_is_concerned.sh
@@ -17,11 +17,8 @@
# You should have received a copy of the GNU General Public License
# along with opkbuild. If not, see <http://www.gnu.org/licenses/>.
-srcdir="$(dirname "${0}")"
-top_builddir="${PWD}"
-
-. "${srcdir}/aux/tap-functions.sh"
-. "${top_builddir}/lib/libopkbuild.${SHSOEXT}.${LIBOPKBUILD_SHSOVERSION}"
+. "${TOP_SRCDIR}/tests/aux/tap-functions.sh"
+. "${TOP_BUILDDIR}/lib/libopkbuild.${SHSOEXT}.${LIBOPKBUILD_SHSOVERSION}"
plan_ 12
diff --git a/tests/ob_reduce_deps.sh b/tests/ob_reduce_deps.sh
index 06d98ec..5519dde 100755
--- a/tests/ob_reduce_deps.sh
+++ b/tests/ob_reduce_deps.sh
@@ -17,11 +17,8 @@
# You should have received a copy of the GNU General Public License
# along with opkbuild. If not, see <http://www.gnu.org/licenses/>.
-srcdir="$(dirname "${0}")"
-top_builddir="${PWD}"
-
-. "${srcdir}/aux/tap-functions.sh"
-. "${top_builddir}/lib/libopkbuild.${SHSOEXT}.${LIBOPKBUILD_SHSOVERSION}"
+. "${TOP_SRCDIR}/tests/aux/tap-functions.sh"
+. "${TOP_BUILDDIR}/lib/libopkbuild.${SHSOEXT}.${LIBOPKBUILD_SHSOVERSION}"
plan_ 11