From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 12 Mar 2010 18:09:28 +0000 (-0500)
Subject: Support the standard 'make check' target in place of 'make verify'
X-Git-Tag: release-2.0.5-beta~78^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=426c8fbe9345ee1d3ee0b05c8e35391ef380ad2c;p=libevent

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 77eaab7e..1ea04cb8 100644
--- 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 8fecf000..7243c0c5 100644
--- 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