Order tests alphabetically

[people/ms/network.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f377747b74d57528771ad38cb5b0c7f9f9a02fbe..c9a7155729954107f14fd3783f82f50c4d589b5a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,7 +101,6 @@ EXTRA_DIST += \
        src/functions/functions.in
 
 dist_network_SCRIPTS = \
-       src/functions/functions.aiccu \
        src/functions/functions.at \
        src/functions/functions.auth \
        src/functions/functions.batman-adv \
@@ -171,8 +170,6 @@ dist_network_SCRIPTS = \
        src/ppp/pppoe-server
 
 dist_helpers_SCRIPTS = \
-       src/helpers/aiccu \
-       src/helpers/aiccu-config-helper \
        src/helpers/bridge-stp \
        src/helpers/dhcpd-config-helper \
        src/helpers/firewall-kernel-init \
@@ -216,7 +213,6 @@ dist_hooks_ports_SCRIPTS = \
 dist_hooks_zones_SCRIPTS = \
        src/hooks/zones/6rd \
        src/hooks/zones/6to4-tunnel \
-       src/hooks/zones/aiccu \
        src/hooks/zones/bridge \
        src/hooks/zones/modem \
        src/hooks/zones/pppoe \
@@ -349,7 +345,6 @@ MANPAGES = \
        man/network-zone.8 \
        man/network-zone-6rd.8 \
        man/network-zone-6to4-tunnel.8 \
-       man/network-zone-aiccu.8 \
        man/network-zone-bridge.8 \
        man/network-zone-config-pppoe-server.8 \
        man/network-zone-modem.8 \
@@ -436,11 +431,23 @@ uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 # - testsuite ------------------------------------------------------------------
 
 TESTS_ENVIRONMENT = \
-       topdir="$(shell pwd)" \
-       networkdir="$(top_srcdir)/src/functions"
+       PATH=$(top_builddir)/src:$(PATH) \
+       functions=$(abs_builddir)/src/functions/functions \
+       networkdir=$(abs_srcdir)/src/functions \
+       testdir=$(top_srcdir)/test
+
+dist_check_DATA = \
+       test/constants.sh
 
 dist_check_SCRIPTS = \
-       test/load-library
+       $(TESTS)
 
 TESTS = \
-       test/load-library
+       test/load-library \
+       test/functions/ip/ip_detect_protocol \
+       test/functions/ip/ip_get_prefix \
+       test/functions/ip/ip_is_network \
+       test/functions/ip/ip_is_valid \
+       test/functions/ip/ip_prefix_is_valid \
+       test/functions/ip/ip_protocol_is_supported \
+       test/functions/ip/ip_split_prefix