diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-06-17 23:55:44 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-06-17 23:55:44 (EDT) |
| commit | 5c55fc05e0e949a9278701efeee379330e5e3153 (patch) | |
| tree | 89ae895b73f3d03133cd908606ae66ac471446a4 | |
| parent | 88f2ade9c3d53270e23fdfd08af9c47beed0adde (diff) | |
opkbuild, tests: Parameterize fakeroot
| -rw-r--r-- | src/opkbuild.sh | 2 | ||||
| -rwxr-xr-x | tests/exe/ob-buildopk.sh | 3 | ||||
| -rw-r--r-- | tests/local.mk | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/opkbuild.sh b/src/opkbuild.sh index 6d9b490..aa942c4 100644 --- a/src/opkbuild.sh +++ b/src/opkbuild.sh @@ -72,7 +72,7 @@ get_options() # Set default option values. opt_build='full' opt_check_build_deps=true - opt_uid0_cmd='fakeroot' + opt_uid0_cmd="${FAKEROOT}" opt_arch_dep=false opt_plat_dep=false diff --git a/tests/exe/ob-buildopk.sh b/tests/exe/ob-buildopk.sh index 005f639..ddf0734 100755 --- a/tests/exe/ob-buildopk.sh +++ b/tests/exe/ob-buildopk.sh @@ -48,8 +48,7 @@ cp -p '../../src/src/foo.sh' 'foo.data/usr/bin/' touch 'foo.control/control' 'foo.control/md5sums' \ 'bar.control/control' 'bar.control/md5sums' -# TODO: Parameterize fakeroot -command_ok_ 'ob-buildopk exit status' -- fakeroot ob-buildopk +command_ok_ 'ob-buildopk exit status' -- "${FAKEROOT}" ob-buildopk for opk in '../../foo_1.0-1_i686-linux-glibc_all.opk' \ '../../bar_1.0-1_all_all.opk'; do command_ok_ 'opk exists' -- [ -f "${opk}" ] diff --git a/tests/local.mk b/tests/local.mk index a138d59..3796ca6 100644 --- a/tests/local.mk +++ b/tests/local.mk @@ -30,6 +30,7 @@ SH_LOG_DRIVER = \ SHLD_LIBRARY_PATH="$(abs_top_builddir)/lib" \ OB_BINDIR="$(abs_top_builddir)/src" \ PATH="$(abs_top_builddir)/src:$${PATH}" \ + FAKEROOT='$(FAKEROOT)' \ $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh EXTRA_DIST += \ $(TESTS) \ |