X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fautomake.mk;h=7872d21a273bbcd23736d35b458e3eb7b4e9fef0;hb=c84933bf9a73e334207b6b309749d9e9c3b04812;hp=d6f6783911660942bc320cdf6da94dedbe1c8e3d;hpb=a26cc67c16932fa9d07da200bbff75889cfe7529;p=sliver-openvswitch.git diff --git a/tests/automake.mk b/tests/automake.mk index d6f678391..7872d21a2 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -8,17 +8,25 @@ 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/ofp-print.at \ + tests/ovs-ofctl.at \ + tests/multipath.at \ tests/vconn.at \ - tests/dir_name.at \ + tests/file_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 \ + tests/ofproto-macros.at \ + tests/ofproto.at \ tests/ovsdb.at \ tests/ovsdb-log.at \ tests/ovsdb-types.at \ @@ -37,11 +45,11 @@ 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 -DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE) +DISTCLEANFILES += tests/atconfig tests/atlocal AUTOTEST_PATH = utilities:vswitchd:ovsdb:tests @@ -57,10 +65,10 @@ lcov_wrappers = \ tests/lcov/ovsdb-server \ tests/lcov/ovsdb-tool \ tests/lcov/test-aes128 \ + tests/lcov/test-byte-order \ tests/lcov/test-classifier \ tests/lcov/test-csum \ - tests/lcov/test-dhcp-client \ - tests/lcov/test-dir_name \ + tests/lcov/test-file_name \ tests/lcov/test-flows \ tests/lcov/test-hash \ tests/lcov/test-hmap \ @@ -68,12 +76,15 @@ lcov_wrappers = \ tests/lcov/test-jsonrpc \ tests/lcov/test-list \ tests/lcov/test-lockfile \ + tests/lcov/test-multipath \ tests/lcov/test-ovsdb \ + tests/lcov/test-packets \ + tests/lcov/test-random \ tests/lcov/test-reconnect \ tests/lcov/test-sha1 \ - tests/lcov/test-stp \ tests/lcov/test-timeval \ tests/lcov/test-type-props \ + tests/lcov/test-unix-socket \ tests/lcov/test-uuid \ tests/lcov/test-vconn @@ -91,7 +102,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; \ @@ -106,10 +117,10 @@ valgrind_wrappers = \ tests/valgrind/ovsdb-server \ tests/valgrind/ovsdb-tool \ tests/valgrind/test-aes128 \ + tests/valgrind/test-byte-order \ tests/valgrind/test-classifier \ tests/valgrind/test-csum \ - tests/valgrind/test-dhcp-client \ - tests/valgrind/test-dir_name \ + tests/valgrind/test-file_name \ tests/valgrind/test-flows \ tests/valgrind/test-hash \ tests/valgrind/test-hmap \ @@ -117,12 +128,15 @@ valgrind_wrappers = \ tests/valgrind/test-jsonrpc \ tests/valgrind/test-list \ tests/valgrind/test-lockfile \ + tests/valgrind/test-multipath \ tests/valgrind/test-ovsdb \ + tests/valgrind/test-packets \ + tests/valgrind/test-random \ tests/valgrind/test-reconnect \ tests/valgrind/test-sha1 \ - tests/valgrind/test-stp \ tests/valgrind/test-timeval \ tests/valgrind/test-type-props \ + tests/valgrind/test-unix-socket \ tests/valgrind/test-uuid \ tests/valgrind/test-vconn @@ -177,9 +191,9 @@ noinst_PROGRAMS += tests/test-csum tests_test_csum_SOURCES = tests/test-csum.c tests_test_csum_LDADD = lib/libopenvswitch.a -noinst_PROGRAMS += tests/test-dir_name -tests_test_dir_name_SOURCES = tests/test-dir_name.c -tests_test_dir_name_LDADD = lib/libopenvswitch.a +noinst_PROGRAMS += tests/test-file_name +tests_test_file_name_SOURCES = tests/test-file_name.c +tests_test_file_name_LDADD = lib/libopenvswitch.a noinst_PROGRAMS += tests/test-flows tests_test_flows_SOURCES = tests/test-flows.c @@ -210,12 +224,28 @@ noinst_PROGRAMS += tests/test-lockfile tests_test_lockfile_SOURCES = tests/test-lockfile.c tests_test_lockfile_LDADD = lib/libopenvswitch.a +noinst_PROGRAMS += tests/test-multipath +tests_test_multipath_SOURCES = tests/test-multipath.c +tests_test_multipath_LDADD = lib/libopenvswitch.a + +noinst_PROGRAMS += tests/test-packets +tests_test_packets_SOURCES = tests/test-packets.c +tests_test_packets_LDADD = lib/libopenvswitch.a + +noinst_PROGRAMS += tests/test-random +tests_test_random_SOURCES = tests/test-random.c +tests_test_random_LDADD = lib/libopenvswitch.a + +noinst_PROGRAMS += tests/test-unix-socket +tests_test_unix_socket_SOURCES = tests/test-unix-socket.c +tests_test_unix_socket_LDADD = lib/libopenvswitch.a + noinst_PROGRAMS += tests/test-ovsdb tests_test_ovsdb_SOURCES = \ tests/test-ovsdb.c \ tests/idltest.c \ tests/idltest.h -EXTRA_DIST += tests/uuidfilt.pl +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 @@ -246,14 +276,6 @@ tests_test_strtok_r_SOURCES = tests/test-strtok_r.c noinst_PROGRAMS += tests/test-type-props tests_test_type_props_SOURCES = tests/test-type-props.c -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 @@ -261,11 +283,51 @@ tests_test_uuid_LDADD = lib/libopenvswitch.a noinst_PROGRAMS += tests/test-vconn tests_test_vconn_SOURCES = tests/test-vconn.c tests_test_vconn_LDADD = lib/libopenvswitch.a $(SSL_LIBS) + +noinst_PROGRAMS += tests/test-byte-order +tests_test_byte_order_SOURCES = tests/test-byte-order.c +tests_test_byte_order_LDADD = lib/libopenvswitch.a + +# Python tests. EXTRA_DIST += \ + tests/test-daemon.py \ + tests/test-json.py \ + tests/test-jsonrpc.py \ + tests/test-ovsdb.py \ + tests/test-reconnect.py + +if HAVE_OPENSSL +TESTPKI_FILES = \ tests/testpki-cacert.pem \ tests/testpki-cert.pem \ - tests/testpki-cert2.pem \ tests/testpki-privkey.pem \ - tests/testpki-privkey2.pem \ tests/testpki-req.pem \ + tests/testpki-cert2.pem \ + tests/testpki-privkey2.pem \ tests/testpki-req2.pem +check_DATA += $(TESTPKI_FILES) +CLEANFILES += $(TESTPKI_FILES) + +tests/testpki-cacert.pem: tests/pki/stamp; cp tests/pki/switchca/cacert.pem $@ +tests/testpki-cert.pem: tests/pki/stamp; cp tests/pki/test-cert.pem $@ +tests/testpki-req.pem: tests/pki/stamp; cp tests/pki/test-req.pem $@ +tests/testpki-privkey.pem: tests/pki/stamp; cp tests/pki/test-privkey.pem $@ +tests/testpki-cert2.pem: tests/pki/stamp; cp tests/pki/test2-cert.pem $@ +tests/testpki-req2.pem: tests/pki/stamp; cp tests/pki/test2-req.pem $@ +tests/testpki-privkey2.pem: tests/pki/stamp; cp tests/pki/test2-privkey.pem $@ + +OVS_PKI = $(SHELL) $(srcdir)/utilities/ovs-pki.in --dir=tests/pki --log=tests/ovs-pki.log +tests/pki/stamp: + rm -f tests/pki/stamp + rm -rf tests/pki + $(OVS_PKI) init + $(OVS_PKI) req+sign tests/pki/test + $(OVS_PKI) req+sign tests/pki/test2 + : > tests/pki/stamp +CLEANFILES += tests/ovs-pki.log + +CLEAN_LOCAL += clean-pki +clean-pki: + rm -f tests/pki/stamp + rm -rf tests/pki +endif