Support the standard 'make check' target in place of 'make verify'

Based on patch 2816088 from Zack Weinberg

diff --git a/Makefile.am b/Makefile.am
index 77eaab7e6c8588c32ef23eb9d15248fc6efd094b..1ea04cb832b16eb1af2aeae126bf11aed585d179 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -150,8 +150,7 @@ INCLUDES = -I$(srcdir)/compat -I$(srcdir)/include $(SYS_INCLUDES)
 
 man_MANS = event.3 evdns.3
 
-verify: libevent.la
-       cd test && make verify
+verify: check
 
 doxygen: FORCE
        doxygen $(srcdir)/Doxyfile

diff --git a/test/Makefile.am b/test/Makefile.am
index 8fecf0000bd35bc7a52b2925b37b82bba992f087..7243c0c53774ac09c8b95a19a889629c5ed5a51e 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -8,6 +8,8 @@ noinst_PROGRAMS = test-init test-eof test-weof test-time regress \
        bench bench_cascade bench_http bench_httpclient test-ratelim
 noinst_HEADERS = tinytest.h tinytest_macros.h regress.h
 
+TESTS = $(top_srcdir)/test/test.sh
+
 BUILT_SOURCES = regress.gen.c regress.gen.h
 test_init_SOURCES = test-init.c
 test_init_LDADD = ../libevent_core.la
@@ -61,9 +63,6 @@ regress.gen.c regress.gen.h: regress.rpc $(top_srcdir)/event_rpcgen.py
 
 DISTCLEANFILES = *~
 
-test: test-init test-eof test-weof test-time regress
-
-verify: test
-       @$(srcdir)/test.sh
+verify: check
 
 bench test-init test-eof test-weof test-time: ../libevent.la