5 files changed, 13 insertions, 40 deletions

diff --git a/src/cadet/.gitignore b/src/cadet/.gitignore
index b556fa4c8..e72d81bd8 100644
--- a/src/cadet/.gitignore
+++ b/src/cadet/.gitignore
@@ -24,3 +24,4 @@ test_cadet_local_mq
 test_cadet_*_newtest_cadet_2_reopen
 test_cadet_5_reopen
 test_cadet_2_reopen
+test_cadet_2_destroy
diff --git a/src/namestore/.gitignore b/src/namestore/.gitignore
index f159cdaff..b6a968d61 100644
--- a/src/namestore/.gitignore
+++ b/src/namestore/.gitignore
@@ -18,71 +18,39 @@ test_namestore_api_zone_iteration_specific_zone.nc
 test_namestore_api_zone_iteration_stop.nc
 test_plugin_namestore_postgres
 test_plugin_namestore_sqlite
-test_plugin_namestore_flat
 gnunet-zoneimport
-test_namestore_api_lookup_nick_flat
 test_namestore_api_lookup_nick_postgres
 test_namestore_api_lookup_nick_sqlite
-test_namestore_api_lookup_private_flat
 test_namestore_api_lookup_private_postgres
 test_namestore_api_lookup_private_sqlite
-test_namestore_api_lookup_public_flat
 test_namestore_api_lookup_public_postgres
 test_namestore_api_lookup_public_sqlite
-test_namestore_api_lookup_shadow_filter_flat
 test_namestore_api_lookup_shadow_filter_postgres
 test_namestore_api_lookup_shadow_filter_sqlite
-test_namestore_api_lookup_shadow_flat
 test_namestore_api_lookup_shadow_postgres
 test_namestore_api_lookup_shadow_sqlite
-test_namestore_api_monitoring_existing_flat
 test_namestore_api_monitoring_existing_postgres
 test_namestore_api_monitoring_existing_sqlite
-test_namestore_api_monitoring_flat
 test_namestore_api_monitoring_postgres
 test_namestore_api_monitoring_sqlite
-test_namestore_api_remove_flat
-test_namestore_api_remove_not_existing_record_flat
 test_namestore_api_remove_not_existing_record_postgres
 test_namestore_api_remove_not_existing_record_sqlite
 test_namestore_api_remove_postgres
 test_namestore_api_remove_sqlite
-test_namestore_api_store_flat
 test_namestore_api_store_postgres
 test_namestore_api_store_sqlite
-test_namestore_api_store_update_flat
 test_namestore_api_store_update_postgres
 test_namestore_api_store_update_sqlite
-test_namestore_api_zone_iteration_flat
-test_namestore_api_zone_iteration_nick_flat
 test_namestore_api_zone_iteration_nick_postgres
 test_namestore_api_zone_iteration_nick_sqlite
 test_namestore_api_zone_iteration_postgres
-test_namestore_api_zone_iteration_specific_zone_flat
 test_namestore_api_zone_iteration_specific_zone_postgres
 test_namestore_api_zone_iteration_specific_zone_sqlite
 test_namestore_api_zone_iteration_sqlite
-test_namestore_api_zone_iteration_stop_flat
 test_namestore_api_zone_iteration_stop_postgres
 test_namestore_api_zone_iteration_stop_sqlite
-test_namestore_api_zone_to_name_flat
 test_namestore_api_zone_to_name_postgres
 test_namestore_api_zone_to_name_sqlite
-test_namestore_api_lookup_nick_flat
-test_namestore_api_lookup_private_flat
-test_namestore_api_lookup_public_flat
-test_namestore_api_lookup_shadow_filter_flat
-test_namestore_api_lookup_shadow_flat
-test_namestore_api_monitoring_existing_flat
-test_namestore_api_monitoring_flat
-test_namestore_api_remove_flat
-test_namestore_api_remove_not_existing_record_flat
-test_namestore_api_store_flat
-test_namestore_api_store_update_flat
-test_namestore_api_zone_iteration_flat
-test_namestore_api_zone_iteration_nick_flat
-test_namestore_api_zone_iteration_specific_zone_flat
-test_namestore_api_zone_iteration_stop_flat
-test_namestore_api_zone_to_name_flat
-test_plugin_namestore_flat
-perf_namestore_api_zone_iteration_flat
+test_namestore_api_tx_rollback_postgres
+test_namestore_api_tx_rollback_sqlite
+test_namestore_api_edit_records_postgres
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index b71896894..5142058ad 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -15,6 +15,7 @@ if USE_COVERAGE
   XLIBS = -lgcov
 endif
 
+
 if HAVE_SQLITE
 SQLITE_PLUGIN = libgnunet_plugin_namestore_sqlite.la
 SQLITE_TESTS = test_plugin_namestore_sqlite \
@@ -38,6 +39,7 @@ SQLITE_TESTS = test_plugin_namestore_sqlite \
  test_namestore_api_tx_rollback_sqlite
 endif
 
+
 if HAVE_POSTGRESQL
 POSTGRES_PLUGIN = libgnunet_plugin_namestore_postgres.la
 POSTGRES_TESTS = test_plugin_namestore_postgres \
@@ -58,8 +60,10 @@ POSTGRES_TESTS = test_plugin_namestore_postgres \
  test_namestore_api_monitoring_existing_postgres \
  test_namestore_api_zone_to_name_postgres \
  perf_namestore_api_zone_iteration_postgres \
- test_namestore_api_tx_rollback_postgres \
- test_namestore_api_edit_records_postgres
+ test_namestore_api_tx_rollback_postgres
+if HAVE_EXPERIMENTAL
+POSTGRES_TESTS += test_namestore_api_edit_records_postgres
+endif
 endif
 
 if HAVE_SQLITE
@@ -443,6 +447,7 @@ test_namestore_api_tx_rollback_postgres_LDADD = \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
+if HAVE_EXPERIMENTAL
 test_namestore_api_edit_records_postgres_SOURCES = \
  test_namestore_api_edit_records.c
 test_namestore_api_edit_records_postgres_LDADD = \
@@ -451,6 +456,7 @@ test_namestore_api_edit_records_postgres_LDADD = \
   libgnunetnamestore.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/util/libgnunetutil.la
+endif
 
 test_namestore_api_zone_iteration_sqlite_SOURCES = \
  test_namestore_api_zone_iteration.c
diff --git a/src/namestore/test_namestore_api_monitoring_existing.c b/src/namestore/test_namestore_api_monitoring_existing.c
index 95907f34a..1803b8ba4 100644
--- a/src/namestore/test_namestore_api_monitoring_existing.c
+++ b/src/namestore/test_namestore_api_monitoring_existing.c
@@ -248,9 +248,6 @@ put_cont (void *cls,
     return;
   }
 
-  if (3 == c)
-  {
-  }
 }
 
 
diff --git a/src/transport/.gitignore b/src/transport/.gitignore
index c9a208f5e..5a82a787b 100644
--- a/src/transport/.gitignore
+++ b/src/transport/.gitignore
@@ -90,3 +90,4 @@ gnunet-communicator-udp
 test_communicator_unix
 test_communicator_basic_unix
 test_transport_start_with_config
+test_transport_api2_tcp