From c589ff445c5a959bb19fefc559fd9042dfb72c8e Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Tue, 18 Jun 2019 01:14:19 -0400 Subject: ob-buildopk, ob-unpacksource, tests: Use ${TAR} --- (limited to 'tests') diff --git a/tests/exe/ob-buildopk.sh b/tests/exe/ob-buildopk.sh index 3b211f2..020824a 100755 --- a/tests/exe/ob-buildopk.sh +++ b/tests/exe/ob-buildopk.sh @@ -27,7 +27,7 @@ ls_outer() local opk="${1}" shift 1 - tar -tzf "${opk}" + ${TAR} -tzf "${opk}" } ls_inner() @@ -36,7 +36,7 @@ ls_inner() local mbr="${2}" shift 2 - tar -xzOf "${opk}" "${mbr}" | tar -tz + ${TAR} -xzOf "${opk}" "${mbr}" | ${TAR} -tz } plan_ 9 diff --git a/tests/exe/ob-unpacksource.sh b/tests/exe/ob-unpacksource.sh index fbe94a2..901c221 100755 --- a/tests/exe/ob-unpacksource.sh +++ b/tests/exe/ob-unpacksource.sh @@ -34,7 +34,7 @@ cmd_is 'native sources unpacked' cat 'src/src/foo.sh' <<-EOF rm -Rf 'src/' mv '../src/' 'foo/' -tar -czf '../foo-1.0.orig.tar.gz' 'foo/' +${TAR} -czf '../foo-1.0.orig.tar.gz' 'foo/' rm -Rf 'foo/' command_ok_ 'ob-unpacksource exit status' ob-unpacksource diff --git a/tests/exe/opkbuild.sh b/tests/exe/opkbuild.sh index 6baeab0..b569986 100755 --- a/tests/exe/opkbuild.sh +++ b/tests/exe/opkbuild.sh @@ -27,7 +27,7 @@ ls_outer() local opk="${1}" shift 1 - tar -tzf "${opk}" + ${TAR} -tzf "${opk}" } ls_inner() @@ -36,7 +36,7 @@ ls_inner() local mbr="${2}" shift 2 - tar -xzOf "${opk}" "${mbr}" | tar -tz + ${TAR} -xzOf "${opk}" "${mbr}" | ${TAR} -tz } plan_ 12 diff --git a/tests/local.mk b/tests/local.mk index 3796ca6..b872909 100644 --- a/tests/local.mk +++ b/tests/local.mk @@ -31,6 +31,7 @@ SH_LOG_DRIVER = \ OB_BINDIR="$(abs_top_builddir)/src" \ PATH="$(abs_top_builddir)/src:$${PATH}" \ FAKEROOT='$(FAKEROOT)' \ + TAR='$(TAR)' \ $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh EXTRA_DIST += \ $(TESTS) \ -- cgit v0.9.1