From fc71606480f332156f00f590edce14b48ddc60e1 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Sun, 25 May 2014 11:03:41 +1000 Subject: [PATCH] ctdb-tests: Fix the tests for waf build Signed-off-by: Amitay Isaacs Reviewed-by: Michael Adam --- ctdb/tests/scripts/common.sh | 2 +- ctdb/tests/simple/01_ctdb_version.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ctdb/tests/scripts/common.sh b/ctdb/tests/scripts/common.sh index 64a176b9174..754ea2e7e2d 100644 --- a/ctdb/tests/scripts/common.sh +++ b/ctdb/tests/scripts/common.sh @@ -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 diff --git a/ctdb/tests/simple/01_ctdb_version.sh b/ctdb/tests/simple/01_ctdb_version.sh index 3e1ed3e7646..902efa0dfa7 100755 --- a/ctdb/tests/simple/01_ctdb_version.sh +++ b/ctdb/tests/simple/01_ctdb_version.sh @@ -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)