1 files changed, 8 insertions, 228 deletions

diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 97b2fd57a..d55124925 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -14,7 +14,8 @@ EXTRA_DIST = \
   gnunet-gns-proxy-setup-ca \
   zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey \
   zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey \
-  zonefiles/test_zonekey
+  zonefiles/test_zonekey \
+  $(check_SCRIPTS)
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
@@ -193,236 +194,15 @@ libgnunet_plugin_block_gns_la_DEPENDENCIES = \
   $(top_builddir)/src/block/libgnunetblock.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la
 
-if HAVE_TESTING
-#check_PROGRAMS = 
-#  test_gns_simple_shorten 
-#  test_gns_simple_lookup 
-#  test_gns_simple_delegated_lookup 
-#  test_gns_simple_mx_lookup 
-#  test_gns_simple_srv_lookup 
-#  test_gns_simple_zkey_lookup 
-#  test_gns_dht_delegated_lookup 
-#  test_gns_pseu_shorten 
-#  test_gns_max_queries 
-#  test_gns_cname_lookup 
-#  test_gns_ns_lookup 
-#  test_gns_revocation 
-#  test_gns_dht_three_peers
-# test_gns_proxy
-endif
+
+check_SCRIPTS = \
+  test_gns_delegated_lookup.sh \
+  test_gns_lookup.sh \
+  test_gnunet_gns.sh
 
 if ENABLE_TEST_RUN
-if LINUX
 if HAVE_SQLITE
-# TESTS = $(check_PROGRAMS)
-endif
+ TESTS = $(check_SCRIPTS)
 endif
 endif
 
-
-#test_gns_proxy_SOURCES = \
-#  test_gns_proxy.c
-#test_gns_proxy_LDADD = -lmicrohttpd @LIBCURL@ \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-#  $(top_builddir)/src/gns/libgnunetgns.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la
-#test_gns_proxy_DEPENDENCIES = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-#  libgnunetgns.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la
-
-test_gns_dht_three_peers_SOURCES = \
-  test_gns_dht_three_peers.c
-test_gns_dht_three_peers_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la
-test_gns_dht_three_peers_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la
-
-test_gns_simple_lookup_SOURCES = \
-  test_gns_simple_lookup.c
-test_gns_simple_lookup_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-test_gns_simple_lookup_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-
-test_gns_simple_delegated_lookup_SOURCES = \
-  test_gns_simple_delegated_lookup.c
-test_gns_simple_delegated_lookup_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-test_gns_simple_delegated_lookup_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-
-test_gns_simple_mx_lookup_SOURCES = \
-  test_gns_simple_mx_lookup.c
-test_gns_simple_mx_lookup_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-test_gns_simple_mx_lookup_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-
-test_gns_simple_srv_lookup_SOURCES = \
-  test_gns_simple_srv_lookup.c
-test_gns_simple_srv_lookup_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-test_gns_simple_srv_lookup_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-
-test_gns_simple_zkey_lookup_SOURCES = \
-  test_gns_simple_zkey_lookup.c
-test_gns_simple_zkey_lookup_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-test_gns_simple_zkey_lookup_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-
-test_gns_dht_delegated_lookup_SOURCES = \
-  test_gns_dht_delegated_lookup.c
-test_gns_dht_delegated_lookup_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-test_gns_dht_delegated_lookup_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-
-test_gns_simple_shorten_SOURCES = \
-  test_gns_simple_shorten.c
-test_gns_simple_shorten_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-test_gns_simple_shorten_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-
-
-test_gns_pseu_shorten_SOURCES = \
-  test_gns_pseu_shorten.c
-test_gns_pseu_shorten_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-test_gns_pseu_shorten_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-
-
-test_gns_max_queries_SOURCES = \
-  test_gns_max_queries.c
-test_gns_max_queries_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-test_gns_max_queries_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-
-test_gns_cname_lookup_SOURCES = \
-  test_gns_cname_lookup.c
-test_gns_cname_lookup_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-test_gns_cname_lookup_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-
-
-test_gns_ns_lookup_SOURCES = \
-  test_gns_ns_lookup.c
-test_gns_ns_lookup_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-test_gns_ns_lookup_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-
-
-test_gns_revocation_SOURCES = \
-  test_gns_revocation.c
-test_gns_revocation_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-test_gns_revocation_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  libgnunetgns.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
-
-
-
-#Build stub api
-#libgnunetnamestore_la_SOURCES = \
-# namestore_stub_api.c
-#libgnunetnamestore_la_LIBADD = \
-# $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
-#libgnunetnamestore_la_LDFLAGS = \
-#  $(GN_LIB_LDFLAGS)
-#libgnunetnamestore_la_DEPENDENCIES = \
-# $(top_builddir)/src/util/libgnunetutil.la
-
-
-