From d3cd5a3f198b28940617050b8ec00fe0f324971d Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Wed, 14 Mar 2012 11:15:02 +0100
Subject: [PATCH] Fix make distcheck after the new shell tests

With the new shell tests, we have for the first time the situation
where tests require a binary built (via make), but the binary itself
is not the test. Hence, we need to declare and use check_SCRIPTS for
it.

Also corrects a wrong file name (introduced during rebase/editing the
patch series).

The end result is that `make distcheck` now passes.

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
 Makefile.am | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index f57781970..051e6f541 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -821,9 +821,12 @@ dist_TESTS = \
 	$(python_tests)
 
 nodist_TESTS =
+check_SCRIPTS =
+
 if WANT_HTOOLSTESTS
 nodist_TESTS += $(haskell_tests)
 dist_TESTS += htools/offline-test.sh
+check_SCRIPTS += htools/htools-hpc
 endif
 
 TESTS = $(dist_TESTS) $(nodist_TESTS)
@@ -865,7 +868,7 @@ srclink_files = \
 	test/ganeti-cleaner_unittest.bash \
 	test/import-export_unittest.bash \
 	htools/offline-test.sh \
-	htools/cli-tests.sh \
+	htools/cli-tests-defs.sh \
 	$(all_python_code) \
 	$(HS_LIB_SRCS) $(HS_PROG_SRCS)
 
-- 
GitLab