From 415c261ba0169b53235d5e96da4d058e5e1f2d00 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Tue, 28 Aug 2012 11:43:40 +0000 Subject: tests --- src/transport/Makefile.am | 96 ++++++++++------------------------------------- 1 file changed, 20 insertions(+), 76 deletions(-) (limited to 'src/transport/Makefile.am') diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index a2fa0f0e9..d4f16379a 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -34,22 +34,12 @@ if HAVE_LIBCURL HTTPS_API_TEST = test_transport_api_https -endif -endif - -if FALSE - - HTTP_REL_TEST = test_transport_api_reliability_http - HTTP_NAT_REL_TEST = test_transport_api_reliability_http_nat - - HTTPS_NAT_API_TEST = test_transport_api_https_nat HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https HTTPS_REL_TEST = test_transport_api_reliability_https - HTTPS_NAT_REL_TEST = test_transport_api_reliability_https_nat HTTPS_QUOTA_TEST = test_quota_compliance_https \ - test_quota_compliance_https_asymmetric + test_quota_compliance_https_asymmetric endif - +endif if USE_COVERAGE AM_CFLAGS = --coverage -O0 @@ -705,6 +695,21 @@ test_quota_compliance_http_asymmetric_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/transport/libgnunettransporttesting.la +test_quota_compliance_https_SOURCES = \ + test_quota_compliance.c +test_quota_compliance_https_LDADD = \ + $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/transport/libgnunettransporttesting.la + +test_quota_compliance_https_asymmetric_SOURCES = \ + test_quota_compliance.c +test_quota_compliance_https_asymmetric_LDADD = \ + $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/transport/libgnunettransporttesting.la # HTTPS tests test_transport_api_https_SOURCES = \ @@ -714,40 +719,15 @@ test_transport_api_https_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/transport/libgnunettransporttesting.la - -if FALSE - + test_transport_api_timeout_https_SOURCES = \ test_transport_api_timeout.c test_transport_api_timeout_https_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la - -test_transport_api_http_nat_SOURCES = \ - test_transport_api.c -test_transport_api_http_nat_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la - -test_transport_api_reliability_http_nat_SOURCES = \ - test_transport_api_reliability.c -test_transport_api_reliability_http_nat_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la - -test_transport_api_https_nat_SOURCES = \ - test_transport_api.c -test_transport_api_https_nat_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + $(top_builddir)/src/transport/libgnunettransporttesting.la + test_transport_api_reliability_https_SOURCES = \ test_transport_api_reliability.c @@ -757,42 +737,6 @@ test_transport_api_reliability_https_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/transport/libgnunettransporttesting.la -test_transport_api_reliability_https_nat_SOURCES = \ - test_transport_api_reliability.c -test_transport_api_reliability_https_nat_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la - -test_quota_compliance_http_SOURCES = \ - test_quota_compliance.c -test_quota_compliance_http_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la - - -test_quota_compliance_https_SOURCES = \ - test_quota_compliance.c -test_quota_compliance_https_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la - -test_quota_compliance_https_asymmetric_SOURCES = \ - test_quota_compliance.c -test_quota_compliance_https_asymmetric_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la - - -endif - test_transport_api_unreliability_unix_SOURCES = \ test_transport_api_unreliability.c test_transport_api_unreliability_unix_LDADD = \ -- cgit v1.2.3