From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 31 Jan 2012 00:20:16 +0000 (+0000)
Subject: -fix
X-Git-Tag: initial-import-from-subversion-38251~14978
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2d9ae729abd49d3077a06f7a65983dc605717bbb;p=oweals%2Fgnunet.git

-fix
---

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 99b8f2def..c4db16fb0 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -442,7 +442,6 @@ EXTRA_DIST = \
   test_fs_data.conf \
   test_fs_download_data.conf \
   test_fs_file_information_data.conf \
-  test_fs_file_information_meta_data_image.jpg \
   fs_test_lib_data.conf \
   test_fs_list_indexed_data.conf \
   test_fs_namespace_data.conf \
diff --git a/src/fs/test_fs_file_information.c b/src/fs/test_fs_file_information.c
index 8d89312df..679b267b2 100644
--- a/src/fs/test_fs_file_information.c
+++ b/src/fs/test_fs_file_information.c
@@ -137,64 +137,6 @@ run (void *cls, char *const *args, const char *cfgfile,
 }
 
 
-static int
-testThumbnail ()
-{
-  struct GNUNET_CONTAINER_MetaData *m;
-  struct GNUNET_CONTAINER_MetaData *d;
-  struct EXTRACTOR_PluginList *ex;
-  unsigned char *thumb;
-  size_t size;
-  char *date;
-
-  ex = EXTRACTOR_plugin_add_config (NULL, "thumbnailgtk",
-                                    EXTRACTOR_OPTION_DEFAULT_POLICY);
-  if (ex == NULL)
-  {
-    FPRINTF (stderr,
-             "%s",
-	     "Test incomplete, have no GTK thumbnail extractor available.\n");
-    return 0;                   /* can not test, no thumbnailer */
-  }
-  ex = EXTRACTOR_plugin_add_config (ex, "mime",
-                                    EXTRACTOR_OPTION_DEFAULT_POLICY);
-  m = GNUNET_CONTAINER_meta_data_create ();
-  if (3 !=
-      GNUNET_FS_meta_data_extract_from_file (m,
-                                             "test_fs_file_information_meta_data_image.jpg",
-                                             ex))
-  {
-    GNUNET_break (0);
-    EXTRACTOR_plugin_remove_all (ex);
-    GNUNET_CONTAINER_meta_data_destroy (m);
-    return 1;
-  }
-  EXTRACTOR_plugin_remove_all (ex);
-  d = GNUNET_CONTAINER_meta_data_duplicate (m);
-  GNUNET_CONTAINER_meta_data_destroy (m);
-  thumb = NULL;
-  size = GNUNET_CONTAINER_meta_data_get_thumbnail (d, &thumb);
-  if (size == 0)
-  {
-    GNUNET_break (0);
-    GNUNET_CONTAINER_meta_data_destroy (d);
-    return 1;
-  }
-  GNUNET_free (thumb);
-  GNUNET_CONTAINER_meta_data_add_publication_date (d);
-  date =
-      GNUNET_CONTAINER_meta_data_get_by_type (d,
-                                              EXTRACTOR_METATYPE_PUBLICATION_DATE);
-  if (date == NULL)
-  {
-    GNUNET_break (0);
-    GNUNET_CONTAINER_meta_data_destroy (d);
-    return 1;
-  }
-  GNUNET_free (date);
-  GNUNET_CONTAINER_meta_data_destroy (d);
-  return 0;
-}
 
 
 
@@ -221,8 +163,6 @@ main (int argc, char *argv[])
                     "WARNING",
 #endif
                     NULL);
-  if (0 != testThumbnail ())
-    return 1;
   GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx,
                       "test-fs-file_information", "nohelp", options, &run,
                       NULL);
diff --git a/src/fs/test_fs_file_information_meta_data_image.jpg b/src/fs/test_fs_file_information_meta_data_image.jpg
deleted file mode 100644
index 3d1ba3307..000000000
Binary files a/src/fs/test_fs_file_information_meta_data_image.jpg and /dev/null differ