X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=4d3f91fb80d6ca7b54e56978ef7504e91c93cf73;hb=0fe43b4d2de5ac336c2f1635b9a8f60b3ae00370;hp=6139816918b197d2101af9d83f312a175b3b847f;hpb=f5d365ec44b9e04c03c7e97e94080bcd134f319a;p=miniexpect.git

diff --git a/Makefile.am b/Makefile.am
index 6139816..4d3f91f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,17 +39,39 @@ example_sshpass_LDADD = libminiexpect.la
 # Tests.
 
 TESTS = $(check_PROGRAMS)
-check_PROGRAMS = test-spawn
+check_PROGRAMS = \
+	test-spawn \
+	test-ls-version
 
-test_spawn_SOURCES = test-spawn.c
+test_spawn_SOURCES = test-spawn.c tests.h miniexpect.h
 test_spawn_CFLAGS = $(PCRE_CFLAGS) -Wall
 test_spawn_LDADD = libminiexpect.la
 
+test_ls_version_SOURCES = test-ls-version.c tests.h miniexpect.h
+test_ls_version_CFLAGS = $(PCRE_CFLAGS) -Wall
+test_ls_version_LDADD = libminiexpect.la
+
+# parallel-tests breaks the ability to put 'valgrind' into
+# TESTS_ENVIRONMENT.  Hence we have to work around it:
+check-valgrind:
+	for t in $(TESTS); do \
+	  $(LIBTOOL) --mode=execute $(VG) ./$$t; \
+	  r=$$?; \
+	  if [ $$r -ne 0 ]; then exit $$r; fi; \
+	done
+
+# Clean.
+
+CLEANFILES = *~
+
 # Man pages.
 
 man_MANS = miniexpect.3
 
 if HAVE_POD2MAN
+
+CLEANFILES += miniexpect.3
+
 miniexpect.3: miniexpect.pod
 	$(POD2MAN) \
 	  --section 3 \
@@ -57,8 +79,5 @@ miniexpect.3: miniexpect.pod
 	  -c "Library functions" \
 	  $< > $@-t
 	mv $@-t $@
-endif
-
-# Clean.
 
-CLEANFILES = *~
+endif