From 3e5012c6886e8f61b62e77e6fe50b1cc37e4c8d2 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 22 Mar 2012 14:55:01 +0000
Subject: [PATCH] Fix out-of-tree builds
The new shell tests do not succeed out-of-tree, due to static paths
and other issues. This trivial patch fixes these issue, make distcheck
now passes.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
Makefile.am | 1 +
htools/cli-tests-defs.sh | 2 +-
htools/offline-test.sh | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 0c9425aba..9705913c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -720,6 +720,7 @@ TEST_FILES = \
test/data/sys_drbd_usermode_helper.txt \
test/data/htools/hail-alloc-drbd.json \
test/data/htools/hail-change-group.json \
+ test/data/htools/hail-invalid-reloc.json \
test/data/htools/hail-node-evac.json \
test/data/htools/hail-reloc-drbd.json \
test/data/htools/common-suffix.data \
diff --git a/htools/cli-tests-defs.sh b/htools/cli-tests-defs.sh
index 069b1a3ae..e34839be5 100644
--- a/htools/cli-tests-defs.sh
+++ b/htools/cli-tests-defs.sh
@@ -21,7 +21,7 @@
HBINARY=${HBINARY:-./htools/hpc-htools}
-TESTDATA_DIR=${TOP_SRCDIR:-.}/test/data/htools
+export TESTDATA_DIR=${TOP_SRCDIR:-.}/test/data/htools
hbal() {
HTOOLS=hbal $HBINARY "$@"
diff --git a/htools/offline-test.sh b/htools/offline-test.sh
index f776a5e37..51ff12c9e 100755
--- a/htools/offline-test.sh
+++ b/htools/offline-test.sh
@@ -86,6 +86,6 @@ echo OK
echo Running shelltest...
-shelltest $SHELLTESTARGS test/ -- --hide-successes
+shelltest $SHELLTESTARGS ${TOP_SRCDIR:-.}/test/ -- --hide-successes
echo All OK
--
GitLab