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>

diff --git a/Makefile.am b/Makefile.am
index 0c9425a..9705913 100644 (file)
--- 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 069b1a3..e34839b 100644 (file)
--- 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 f776a5e..51ff12c 100755 (executable)
--- 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