sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-24 13:57:43 +03:00
Code

ctdb-tests: Fix the tests for waf build

Browse Source 
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Amitay Isaacs 2014-05-25 11:03:41 +10:00 committed by Michael Adam
parent 43c10db3a2
commit fc71606480
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/tests/scripts/common.sh
View File

@ -29,7 +29,7 @@ if [ -f "${_test_dir}/run_tests.sh" ] ; then
fi
fi
_test_bin_dir="${TEST_BIN_DIR:-${_test_dir}/bin}"
_test_bin_dir="${TEST_BIN_DIR:-${ctdb_dir}/bin}"
if [ -d "$_test_bin_dir" ] ; then
PATH="${_test_bin_dir}:$PATH"
fi

4
ctdb/tests/simple/01_ctdb_version.sh
View File

@ -33,11 +33,11 @@ set -e
cluster_is_healthy
if ! try_command_on_node -v 0 "rpm -q ctdb" ; then
if ! try_command_on_node -v 0 "rpm -qf $0" ; then
echo "No useful output from rpm, SKIPPING rest of test".
exit 0
fi
rpm_ver="${out#ctdb-}"
rpm_ver="${out#ctdb-tests-}"
# Some version of RPM append the architecture to the version.
# And also remove the release suffix.
arch=$(uname -m)