From 1b03e2cd33a059fdd355c52899e151130777c44f Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Fri, 3 Aug 2012 21:24:51 +0200
Subject: tests: make compatible with autotools

The command 'make check' is called from 'make distcheck' (which is
used to generate official util-linux tarballs).

It means that tests/ stuff has to be compatible with autotools and
differentiate between source and build directories.

 * remove run-nonroot.sh (merged into run.sh
 * remove commands.sh.in
 * all tests and top level run.sh accept --builddir and --srcdir
   command line options
 * functions.sh modified to use $top_builddir/tests for output files

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 tests/Makemodule.am | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'tests/Makemodule.am')

diff --git a/tests/Makemodule.am b/tests/Makemodule.am
index a5e26bfb1..00da7d35d 100644
--- a/tests/Makemodule.am
+++ b/tests/Makemodule.am
@@ -4,12 +4,17 @@ include tests/helpers/Makemodule.am
 EXTRA_DIST += \
 	tests/expected \
 	tests/functions.sh \
+	tests/commands.sh \
 	tests/run.sh \
-	tests/run-nonroot.sh \
 	tests/ts
 
 clean-local-tests:
-	rm -rf output diff
+	rm -rf $(top_builddir)/tests/output $(top_builddir)/tests/diff
 
-TESTS += tests/run-nonroot.sh
 CLEAN_LOCALS += clean-local-tests
+
+
+check-local-tests: $(check_PROGRAMS)
+	$(top_srcdir)/tests/run.sh --srcdir=$(abs_top_srcdir) --builddir=$(abs_top_builddir) --nonroot
+
+CHECK_LOCALS += check-local-tests
-- 
cgit v1.2.3-55-g7522