Implement initial Python bindings for Open vSwitch database.

[sliver-openvswitch.git] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index e5cd0ec..e647bbb 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -8,14 +8,17 @@ TESTSUITE_AT = \
        tests/testsuite.at \
        tests/ovsdb-macros.at \
        tests/library.at \
+       tests/classifier.at \
        tests/check-structs.at \
        tests/daemon.at \
+       tests/daemon-py.at \
        tests/vconn.at \
        tests/dir_name.at \
        tests/aes128.at \
        tests/uuid.at \
        tests/json.at \
        tests/jsonrpc.at \
+       tests/jsonrpc-py.at \
        tests/timeval.at \
        tests/lockfile.at \
        tests/reconnect.at \
@@ -37,7 +40,7 @@ TESTSUITE_AT = \
        tests/ovsdb-server.at \
        tests/ovsdb-monitor.at \
        tests/ovsdb-idl.at \
-       tests/stp.at \
+       tests/ovsdb-idl-py.at \
        tests/ovs-vsctl.at \
        tests/interface-reconfigure.at
 TESTSUITE = $(srcdir)/tests/testsuite
@@ -71,7 +74,6 @@ lcov_wrappers = \
        tests/lcov/test-ovsdb \
        tests/lcov/test-reconnect \
        tests/lcov/test-sha1 \
-       tests/lcov/test-stp \
        tests/lcov/test-timeval \
        tests/lcov/test-type-props \
        tests/lcov/test-uuid \
@@ -91,7 +93,7 @@ LCOV = lcov -b $(abs_top_builddir) -d $(abs_top_builddir) -q
 check-lcov: all tests/atconfig tests/atlocal $(TESTSUITE) $(lcov_wrappers)
        rm -fr tests/coverage.html tests/coverage.info
        $(LCOV) -c -i -o - > tests/coverage.info
-       $(SHELL) '$(TESTSUITE)' -C tests CHECK_LCOV=true AUTOTEST_PATH='tests/lcov:$(AUTOTEST_PATH)' $(TESTSUITEFLAGS); \
+       $(SHELL) '$(TESTSUITE)' -C tests CHECK_LCOV=true DISABLE_LCOV=false AUTOTEST_PATH='tests/lcov:$(AUTOTEST_PATH)' $(TESTSUITEFLAGS); \
                rc=$$?; \
                echo "Producing coverage.html..."; \
                cd tests && genhtml -q -o coverage.html coverage.info; \
@@ -120,7 +122,6 @@ valgrind_wrappers = \
        tests/valgrind/test-ovsdb \
        tests/valgrind/test-reconnect \
        tests/valgrind/test-sha1 \
-       tests/valgrind/test-stp \
        tests/valgrind/test-timeval \
        tests/valgrind/test-type-props \
        tests/valgrind/test-uuid \
@@ -215,8 +216,8 @@ tests_test_ovsdb_SOURCES = \
        tests/test-ovsdb.c \
        tests/idltest.c \
        tests/idltest.h
-EXTRA_DIST += tests/uuidfilt.pl
-tests_test_ovsdb_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a $(SSL_LIBS) $(PCRE_LIBS)
+EXTRA_DIST += tests/uuidfilt.pl tests/ovsdb-monitor-sort.pl
+tests_test_ovsdb_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a $(SSL_LIBS)
 
 # idltest schema and IDL
 OVSIDL_BUILT +=        tests/idltest.c tests/idltest.h tests/idltest.ovsidl
@@ -250,10 +251,6 @@ noinst_PROGRAMS += tests/test-dhcp-client
 tests_test_dhcp_client_SOURCES = tests/test-dhcp-client.c
 tests_test_dhcp_client_LDADD = lib/libopenvswitch.a
 
-noinst_PROGRAMS += tests/test-stp
-tests_test_stp_SOURCES = tests/test-stp.c
-tests_test_stp_LDADD = lib/libopenvswitch.a
-
 noinst_PROGRAMS += tests/test-uuid
 tests_test_uuid_SOURCES = tests/test-uuid.c
 tests_test_uuid_LDADD = lib/libopenvswitch.a
@@ -269,3 +266,11 @@ EXTRA_DIST += \
        tests/testpki-privkey2.pem \
        tests/testpki-req.pem \
        tests/testpki-req2.pem
+
+# Python tests.
+EXTRA_DIST += \
+       tests/test-daemon.py \
+       tests/test-json.py \
+       tests/test-jsonrpc.py \
+       tests/test-ovsdb.py \
+       tests/test-reconnect.py