From 4fd6ebf544f90a6d18e6828eb3edc7b75f3b90a2 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 15 Apr 2011 12:41:22 +1000 Subject: selftest: Remove duplication between BUILDIR and BINDIR Just have BINDIR, and have it default to ./bin Andrew Bartlett --- source4/torture/tests/test_gentest.sh | 2 +- source4/torture/tests/test_locktest.sh | 2 +- source4/torture/tests/test_masktest.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/torture/tests') diff --git a/source4/torture/tests/test_gentest.sh b/source4/torture/tests/test_gentest.sh index b85636b2f7..9f6e60c307 100755 --- a/source4/torture/tests/test_gentest.sh +++ b/source4/torture/tests/test_gentest.sh @@ -18,7 +18,7 @@ PREFIX=$5 shift 5 failed=0 -samba4bindir="$BUILDDIR/bin" +samba4bindir="$BINDIR" gentest="$samba4bindir/gentest$EXEEXT" . `dirname $0`/../../../testprogs/blackbox/subunit.sh diff --git a/source4/torture/tests/test_locktest.sh b/source4/torture/tests/test_locktest.sh index a8f11ee0ba..e1d2a1ade4 100755 --- a/source4/torture/tests/test_locktest.sh +++ b/source4/torture/tests/test_locktest.sh @@ -18,7 +18,7 @@ PREFIX=$5 shift 5 failed=0 -samba4bindir="$BUILDDIR/bin" +samba4bindir="$BINDIR" locktest="$samba4bindir/locktest$EXEEXT" . `dirname $0`/../../../testprogs/blackbox/subunit.sh diff --git a/source4/torture/tests/test_masktest.sh b/source4/torture/tests/test_masktest.sh index e4fa65ccfb..b3362e8960 100755 --- a/source4/torture/tests/test_masktest.sh +++ b/source4/torture/tests/test_masktest.sh @@ -18,7 +18,7 @@ PREFIX=$5 shift 5 failed=0 -samba4bindir="$BUILDDIR/bin" +samba4bindir="$BINDIR" masktest="$samba4bindir/masktest$EXEEXT" . `dirname $0`/../../../testprogs/blackbox/subunit.sh -- cgit