diff options
Diffstat (limited to 'src/transport/Makefile.am')
-rw-r--r-- | src/transport/Makefile.am | 68 |
1 files changed, 24 insertions, 44 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 5069e95b6..ae77899a0 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -369,9 +369,6 @@ gnunet_service_tng_LDADD = \ | |||
369 | 369 | ||
370 | plugin_LTLIBRARIES = \ | 370 | plugin_LTLIBRARIES = \ |
371 | libgnunet_plugin_transport_tcp.la \ | 371 | libgnunet_plugin_transport_tcp.la \ |
372 | if HAVE_EXPERIMENTAL | ||
373 | libgnunet_plugin_transport_udp.la \ | ||
374 | endif | ||
375 | $(UNIX_PLUGIN_LA) \ | 372 | $(UNIX_PLUGIN_LA) \ |
376 | $(HTTP_CLIENT_PLUGIN_LA) \ | 373 | $(HTTP_CLIENT_PLUGIN_LA) \ |
377 | $(HTTPS_CLIENT_PLUGIN_LA) \ | 374 | $(HTTPS_CLIENT_PLUGIN_LA) \ |
@@ -380,6 +377,10 @@ endif | |||
380 | $(WLAN_PLUGIN_LA) \ | 377 | $(WLAN_PLUGIN_LA) \ |
381 | $(BT_PLUGIN_LA) | 378 | $(BT_PLUGIN_LA) |
382 | 379 | ||
380 | if HAVE_EXPERIMENTAL | ||
381 | plugin_LTLIBRARIES += libgnunet_plugin_transport_udp.la | ||
382 | endif | ||
383 | |||
383 | # Note: real plugins of course need to be added | 384 | # Note: real plugins of course need to be added |
384 | # to the plugin_LTLIBRARIES above | 385 | # to the plugin_LTLIBRARIES above |
385 | noinst_LTLIBRARIES = \ | 386 | noinst_LTLIBRARIES = \ |
@@ -519,19 +520,12 @@ libgnunet_plugin_transport_https_server_la_LDFLAGS = \ | |||
519 | libgnunet_plugin_transport_https_server_la_CFLAGS = \ | 520 | libgnunet_plugin_transport_https_server_la_CFLAGS = \ |
520 | $(MHD_CFLAGS) $(AM_CFLAGS) -DBUILD_HTTPS | 521 | $(MHD_CFLAGS) $(AM_CFLAGS) -DBUILD_HTTPS |
521 | 522 | ||
522 | |||
523 | if HAVE_TESTING | 523 | if HAVE_TESTING |
524 | check_PROGRAMS = \ | 524 | check_PROGRAMS = \ |
525 | test_transport_address_switch_tcp \ | 525 | test_transport_address_switch_tcp \ |
526 | if HAVE_EXPERIMENTAL | ||
527 | test_transport_address_switch_udp \ | ||
528 | endif | ||
529 | test_transport_testing_startstop \ | 526 | test_transport_testing_startstop \ |
530 | test_transport_testing_restart \ | 527 | test_transport_testing_restart \ |
531 | test_plugin_tcp \ | 528 | test_plugin_tcp \ |
532 | if HAVE_EXPERIMENTAL | ||
533 | test_plugin_udp \ | ||
534 | endif | ||
535 | $(UNIX_TEST) \ | 529 | $(UNIX_TEST) \ |
536 | $(WLAN_PLUGIN_TEST) \ | 530 | $(WLAN_PLUGIN_TEST) \ |
537 | $(BT_PLUGIN_TEST) \ | 531 | $(BT_PLUGIN_TEST) \ |
@@ -548,16 +542,9 @@ endif | |||
548 | test_transport_api_timeout_tcp \ | 542 | test_transport_api_timeout_tcp \ |
549 | test_transport_api_limited_sockets_tcp \ | 543 | test_transport_api_limited_sockets_tcp \ |
550 | test_transport_api_tcp_nat \ | 544 | test_transport_api_tcp_nat \ |
551 | if HAVE_EXPERIMENTAL | ||
552 | test_transport_api_udp \ | ||
553 | test_transport_api_timeout_udp \ | ||
554 | endif | ||
555 | $(UNIX_PLUGIN_TEST) \ | 545 | $(UNIX_PLUGIN_TEST) \ |
556 | $(UNIX_PLUGIN_TIMEOUT_TEST) \ | 546 | $(UNIX_PLUGIN_TIMEOUT_TEST) \ |
557 | $(UNIX_API_ABSTRACT_TEST) \ | 547 | $(UNIX_API_ABSTRACT_TEST) \ |
558 | if HAVE_EXPERIMENTAL | ||
559 | test_transport_api_udp_nat \ | ||
560 | endif | ||
561 | $(HTTP_API_TEST) \ | 548 | $(HTTP_API_TEST) \ |
562 | $(HTTP_REVERSE_API_TEST) \ | 549 | $(HTTP_REVERSE_API_TEST) \ |
563 | $(HTTP_API_TIMEOUT_TEST) \ | 550 | $(HTTP_API_TIMEOUT_TEST) \ |
@@ -582,9 +569,6 @@ endif | |||
582 | test_transport_api_manipulation_cfg \ | 569 | test_transport_api_manipulation_cfg \ |
583 | test_transport_api_reliability_tcp \ | 570 | test_transport_api_reliability_tcp \ |
584 | test_transport_api_reliability_tcp_nat \ | 571 | test_transport_api_reliability_tcp_nat \ |
585 | if HAVE_EXPERIMENTAL | ||
586 | test_transport_api_reliability_udp \ | ||
587 | endif | ||
588 | $(UNIX_REL_TEST) \ | 572 | $(UNIX_REL_TEST) \ |
589 | $(HTTP_REL_TEST) \ | 573 | $(HTTP_REL_TEST) \ |
590 | $(HTTPS_REL_TEST) \ | 574 | $(HTTPS_REL_TEST) \ |
@@ -594,9 +578,6 @@ endif | |||
594 | $(BT_UREL_TEST) \ | 578 | $(BT_UREL_TEST) \ |
595 | test_quota_compliance_tcp \ | 579 | test_quota_compliance_tcp \ |
596 | test_quota_compliance_tcp_asymmetric \ | 580 | test_quota_compliance_tcp_asymmetric \ |
597 | if HAVE_EXPERIMENTAL | ||
598 | test_quota_compliance_udp \ | ||
599 | endif | ||
600 | $(UNIX_QUOTA_TEST) \ | 581 | $(UNIX_QUOTA_TEST) \ |
601 | $(HTTP_QUOTA_TEST) \ | 582 | $(HTTP_QUOTA_TEST) \ |
602 | $(HTTPS_QUOTA_TEST) \ | 583 | $(HTTPS_QUOTA_TEST) \ |
@@ -608,23 +589,27 @@ test_transport_api_slow_ats | |||
608 | endif | 589 | endif |
609 | check_PROGRAMS += \ | 590 | check_PROGRAMS += \ |
610 | test_communicator_unix | 591 | test_communicator_unix |
592 | if HAVE_EXPERIMENTAL | ||
593 | check_PROGRAMS += \ | ||
594 | test_transport_address_switch_udp \ | ||
595 | test_plugin_udp \ | ||
596 | test_transport_api_udp \ | ||
597 | test_transport_api_timeout_udp \ | ||
598 | test_transport_api_udp_nat \ | ||
599 | test_transport_api_reliability_udp \ | ||
600 | test_quota_compliance_udp | ||
601 | endif | ||
611 | endif | 602 | endif |
612 | 603 | ||
613 | if ENABLE_TEST_RUN | 604 | if ENABLE_TEST_RUN |
614 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 605 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
615 | TESTS = \ | 606 | TESTS = \ |
616 | test_transport_address_switch_tcp \ | 607 | test_transport_address_switch_tcp \ |
617 | if HAVE_EXPERIMENTAL | ||
618 | test_transport_address_switch_udp \ | ||
619 | endif | ||
620 | $(HTTP_SWITCH) \ | 608 | $(HTTP_SWITCH) \ |
621 | $(HTTPS_SWITCH) \ | 609 | $(HTTPS_SWITCH) \ |
622 | test_transport_testing_startstop \ | 610 | test_transport_testing_startstop \ |
623 | test_transport_testing_restart \ | 611 | test_transport_testing_restart \ |
624 | test_plugin_tcp \ | 612 | test_plugin_tcp \ |
625 | if HAVE_EXPERIMENTAL | ||
626 | test_plugin_udp \ | ||
627 | endif | ||
628 | $(UNIX_TEST) \ | 613 | $(UNIX_TEST) \ |
629 | $(WLAN_PLUGIN_TEST) \ | 614 | $(WLAN_PLUGIN_TEST) \ |
630 | $(BT_PLUGIN_TEST) \ | 615 | $(BT_PLUGIN_TEST) \ |
@@ -635,14 +620,8 @@ endif | |||
635 | test_transport_api_restart_2peers \ | 620 | test_transport_api_restart_2peers \ |
636 | test_transport_api_limited_sockets_tcp \ | 621 | test_transport_api_limited_sockets_tcp \ |
637 | test_transport_api_tcp_nat \ | 622 | test_transport_api_tcp_nat \ |
638 | if HAVE_EXPERIMENTAL | ||
639 | test_transport_api_udp \ | ||
640 | endif | ||
641 | $(UNIX_PLUGIN_TEST) \ | 623 | $(UNIX_PLUGIN_TEST) \ |
642 | $(UNIX_API_ABSTRACT_TEST) \ | 624 | $(UNIX_API_ABSTRACT_TEST) \ |
643 | if HAVE_EXPERIMENTAL | ||
644 | test_transport_api_udp_nat \ | ||
645 | endif | ||
646 | $(HTTP_API_TEST) \ | 625 | $(HTTP_API_TEST) \ |
647 | $(HTTPS_API_TEST) \ | 626 | $(HTTPS_API_TEST) \ |
648 | $(WLAN_API_TEST) \ | 627 | $(WLAN_API_TEST) \ |
@@ -660,9 +639,6 @@ endif | |||
660 | test_transport_api_manipulation_cfg \ | 639 | test_transport_api_manipulation_cfg \ |
661 | test_transport_api_reliability_tcp \ | 640 | test_transport_api_reliability_tcp \ |
662 | test_transport_api_reliability_tcp_nat \ | 641 | test_transport_api_reliability_tcp_nat \ |
663 | if HAVE_EXPERIMENTAL | ||
664 | test_transport_api_reliability_udp \ | ||
665 | endif | ||
666 | $(UNIX_REL_TEST) \ | 642 | $(UNIX_REL_TEST) \ |
667 | $(HTTP_REL_TEST) \ | 643 | $(HTTP_REL_TEST) \ |
668 | $(HTTPS_REL_TEST) \ | 644 | $(HTTPS_REL_TEST) \ |
@@ -672,16 +648,10 @@ endif | |||
672 | $(BT_UREL_TEST) \ | 648 | $(BT_UREL_TEST) \ |
673 | test_quota_compliance_tcp \ | 649 | test_quota_compliance_tcp \ |
674 | test_quota_compliance_tcp_asymmetric \ | 650 | test_quota_compliance_tcp_asymmetric \ |
675 | if HAVE_EXPERIMENTAL | ||
676 | test_quota_compliance_udp \ | ||
677 | endif | ||
678 | $(UNIX_QUOTA_TEST) \ | 651 | $(UNIX_QUOTA_TEST) \ |
679 | $(HTTP_QUOTA_TEST) \ | 652 | $(HTTP_QUOTA_TEST) \ |
680 | $(HTTPS_QUOTA_TEST) \ | 653 | $(HTTPS_QUOTA_TEST) \ |
681 | test_transport_api_timeout_tcp \ | 654 | test_transport_api_timeout_tcp \ |
682 | if HAVE_EXPERIMENTAL | ||
683 | test_transport_api_timeout_udp \ | ||
684 | endif | ||
685 | $(UNIX_PLUGIN_TIMEOUT_TEST) \ | 655 | $(UNIX_PLUGIN_TIMEOUT_TEST) \ |
686 | $(HTTP_API_TIMEOUT_TEST) \ | 656 | $(HTTP_API_TIMEOUT_TEST) \ |
687 | $(HTTPS_API_TIMEOUT_TEST) \ | 657 | $(HTTPS_API_TIMEOUT_TEST) \ |
@@ -691,6 +661,16 @@ if HAVE_GETOPT_BINARY | |||
691 | TESTS += \ | 661 | TESTS += \ |
692 | test_transport_api_slow_ats | 662 | test_transport_api_slow_ats |
693 | endif | 663 | endif |
664 | if HAVE_EXPERIMENTAL | ||
665 | TESTS += \ | ||
666 | test_transport_address_switch_udp \ | ||
667 | test_plugin_udp \ | ||
668 | test_transport_api_udp \ | ||
669 | test_transport_api_timeout_udp \ | ||
670 | test_transport_api_udp_nat \ | ||
671 | test_transport_api_reliability_udp \ | ||
672 | test_quota_compliance_udp | ||
673 | endif | ||
694 | endif | 674 | endif |
695 | 675 | ||
696 | test_transport_testing_startstop_SOURCES = \ | 676 | test_transport_testing_startstop_SOURCES = \ |