test-hash: Do not exit check_word_hash() when there is a failure.

[cascardo/ovs.git] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index 2dfaff1..abbfcb5 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -6,7 +6,8 @@ EXTRA_DIST += \
        $(KMOD_TESTSUITE) \
        tests/atlocal.in \
        $(srcdir)/package.m4 \
-       $(srcdir)/tests/testsuite
+       $(srcdir)/tests/testsuite \
+       $(srcdir)/tests/testsuite.patch
 
 COMMON_MACROS_AT = \
        tests/ovsdb-macros.at \
@@ -15,6 +16,7 @@ COMMON_MACROS_AT = \
 
 TESTSUITE_AT = \
        tests/testsuite.at \
+       tests/completion.at \
        tests/library.at \
        tests/heap.at \
        tests/bundle.at \
@@ -78,7 +80,8 @@ TESTSUITE_AT = \
        tests/rstp.at \
        tests/interface-reconfigure.at \
        tests/vlog.at \
-       tests/vtep-ctl.at
+       tests/vtep-ctl.at \
+       tests/auto-attach.at
 
 KMOD_TESTSUITE_AT = \
        tests/kmod-testsuite.at \
@@ -86,6 +89,7 @@ KMOD_TESTSUITE_AT = \
        tests/kmod-traffic.at
 
 TESTSUITE = $(srcdir)/tests/testsuite
+TESTSUITE_PATCH = $(srcdir)/tests/testsuite.patch
 KMOD_TESTSUITE = $(srcdir)/tests/kmod-testsuite
 DISTCLEANFILES += tests/atconfig tests/atlocal
 
@@ -195,8 +199,9 @@ clean-local:
        test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C tests --clean
 
 AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(COMMON_MACROS_AT)
+$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(COMMON_MACROS_AT) $(TESTSUITE_PATCH)
        $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+       patch -p0 $@.tmp $(TESTSUITE_PATCH)
        $(AM_V_at)mv $@.tmp $@
 
 $(KMOD_TESTSUITE): package.m4 $(KMOD_TESTSUITE_AT) $(COMMON_MACROS_AT)
@@ -277,7 +282,8 @@ tests_ovstest_SOURCES = \
        tests/test-util.c \
        tests/test-uuid.c \
        tests/test-bitmap.c \
-       tests/test-vconn.c
+       tests/test-vconn.c \
+       tests/test-aa.c
 
 if !WIN32
 tests_ovstest_SOURCES += \