[GNUnet-SVN] r23688 - in Extractor: contrib src/main src/plugins

[gnunet]

Author: grothoff
Date: 2012-09-07 11:09:31 +0200 (Fri, 07 Sep 2012)
New Revision: 23688

Added:
   Extractor/contrib/coverage.sh
Modified:
   Extractor/src/main/
   Extractor/src/main/Makefile.am
   Extractor/src/plugins/
   Extractor/src/plugins/Makefile.am
   Extractor/src/plugins/fuzz_default.sh
Log:
-ignore

Added: Extractor/contrib/coverage.sh
===================================================================
--- Extractor/contrib/coverage.sh                               (rev 0)
+++ Extractor/contrib/coverage.sh       2012-09-07 09:09:31 UTC (rev 23688)
@@ -0,0 +1,14 @@
+#!/bin/sh
+# make sure configure was run with coverage enabled...
+lcov --directory . --zerocounters
+make check || true
+rm `find * -name "test_*.gc??"`
+for n in `find * -name "*.gc??" | grep libs`
+do
+  cd `dirname $n`
+  mv `basename $n` ..
+  cd -
+done
+lcov --directory . --capture --output-file app.info
+mkdir -p doc/coverage
+genhtml -o doc/coverage app.info


Property changes on: Extractor/contrib/coverage.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: Extractor/src/main
===================================================================
--- Extractor/src/main  2012-09-07 09:07:30 UTC (rev 23687)
+++ Extractor/src/main  2012-09-07 09:09:31 UTC (rev 23688)

Property changes on: Extractor/src/main
___________________________________________________________________
Modified: svn:ignore
## -1,3 +1,29 ##
+test2_extractor.gcno
+libextractor_la-extractor_print.gcno
+libextractor_la-extractor_print.gcda
+libextractor_la-extractor_plugpath.gcno
+libextractor_la-extractor_plugpath.gcda
+libextractor_la-extractor_plugins.gcno
+libextractor_la-extractor_plugins.gcda
+libextractor_la-extractor_plugin_main.gcno
+libextractor_la-extractor_plugin_main.gcda
+libextractor_la-extractor_metatypes.gcno
+libextractor_la-extractor_metatypes.gcda
+libextractor_la-extractor_logging.gcno
+libextractor_la-extractor_logging.gcda
+libextractor_la-extractor_ipc_gnu.gcno
+libextractor_la-extractor_ipc_gnu.gcda
+libextractor_la-extractor_ipc.gcno
+libextractor_la-extractor_ipc.gcda
+libextractor_la-extractor_datasource.gcno
+libextractor_la-extractor_datasource.gcda
+libextractor_la-extractor_common.gcno
+libextractor_la-extractor_common.gcda
+libextractor_la-extractor.gcno
+libextractor_la-extractor.gcda
+getopt1.gcno
+getopt.gcno
+extract.gcno
 test_gzip
 test_file
 test_bzip2
Modified: Extractor/src/main/Makefile.am
===================================================================
--- Extractor/src/main/Makefile.am      2012-09-07 09:07:30 UTC (rev 23687)
+++ Extractor/src/main/Makefile.am      2012-09-07 09:09:31 UTC (rev 23688)
@@ -32,7 +32,7 @@
 libextractor_la_LDFLAGS = \
   $(LE_LIB_LDFLAGS) -version-info 
@LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@
 libextractor_la_LIBADD = \
-  $(LIBLTDL) $(zlib) $(bz2lib) $(LTLIBICONV)
+  $(LIBLTDL) $(zlib) $(bz2lib) $(LTLIBICONV) $(XLIB)
 
 if WINDOWS
 EXTRACTOR_IPC=extractor_ipc_w32.c
@@ -87,14 +87,14 @@
 libextractor_test_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_test_la_LIBADD = \
-  $(LE_LIBINTL)
+  $(LE_LIBINTL) $(XLIB)
 
 libextractor_test2_la_SOURCES = \
   test2_extractor.c 
 libextractor_test2_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_test2_la_LIBADD = \
-  $(LE_LIBINTL)
+  $(LE_LIBINTL) $(XLIB)
 
 
 check_PROGRAMS = \

Index: Extractor/src/plugins
===================================================================
--- Extractor/src/plugins       2012-09-07 09:07:30 UTC (rev 23687)
+++ Extractor/src/plugins       2012-09-07 09:09:31 UTC (rev 23688)

Property changes on: Extractor/src/plugins
___________________________________________________________________
Modified: svn:ignore
## -1,3 +1,49 ##
+zip_extractor.gcno
+zip_extractor.gcda
+xm_extractor.gcno
+xm_extractor.gcda
+wav_extractor.gcno
+wav_extractor.gcda
+tiff_extractor.gcno
+tiff_extractor.gcda
+sid_extractor.gcno
+sid_extractor.gcda
+s3m_extractor.gcno
+s3m_extractor.gcda
+rpm_extractor.gcno
+rpm_extractor.gcda
+riff_extractor.gcno
+riff_extractor.gcda
+ps_extractor.gcno
+ps_extractor.gcda
+png_extractor.gcno
+png_extractor.gcda
+ogg_extractor.gcno
+ogg_extractor.gcda
+odf_extractor.gcno
+odf_extractor.gcda
+nsfe_extractor.gcno
+nsfe_extractor.gcda
+nsf_extractor.gcno
+nsf_extractor.gcda
+mpeg_extractor.gcno
+mpeg_extractor.gcda
+man_extractor.gcno
+man_extractor.gcda
+jpeg_extractor.gcno
+jpeg_extractor.gcda
+it_extractor.gcno
+it_extractor.gcda
+gif_extractor.gcno
+gif_extractor.gcda
+flac_extractor.gcno
+flac_extractor.gcda
+extractortmp.TG6l1G
+extractortmp.q1wgkb
+dvi_extractor.gcno
+dvi_extractor.gcda
+deb_extractor.gcno
+deb_extractor.gcda
 test_ps
 test_midi
 test_gstreamer
Modified: Extractor/src/plugins/Makefile.am
===================================================================
--- Extractor/src/plugins/Makefile.am   2012-09-07 09:07:30 UTC (rev 23687)
+++ Extractor/src/plugins/Makefile.am   2012-09-07 09:09:31 UTC (rev 23688)
@@ -244,7 +244,7 @@
 libtest_la_SOURCES = \
   test_lib.c test_lib.h
 libtest_la_LIBADD = \
-  $(top_builddir)/src/main/libextractor.la
+  $(top_builddir)/src/main/libextractor.la $(XLIB) 
 
 
 libextractor_archive_la_SOURCES = \
@@ -252,7 +252,7 @@
 libextractor_archive_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_archive_la_LIBADD = \
-  -larchive
+  -larchive $(XLIB) 
 
 test_archive_SOURCES = \
   test_archive.c
@@ -264,6 +264,8 @@
   deb_extractor.c
 libextractor_deb_la_LDFLAGS = \
   $(PLUGINFLAGS) -lz
+libextractor_deb_la_LIBADD = \
+ $(XLIB) 
 
 test_deb_SOURCES = \
   test_deb.c
@@ -275,6 +277,8 @@
   dvi_extractor.c
 libextractor_dvi_la_LDFLAGS = \
   $(PLUGINFLAGS)
+libextractor_dvi_la_LIBADD = \
+ $(XLIB) 
 
 test_dvi_SOURCES = \
   test_dvi.c
@@ -287,7 +291,7 @@
 libextractor_exiv2_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_exiv2_la_LIBADD = \
-  -lexiv2
+  -lexiv2 $(XLIB)
 
 test_exiv2_SOURCES = \
   test_exiv2.c
@@ -300,7 +304,7 @@
 libextractor_flac_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_flac_la_LIBADD = \
-  -lFLAC
+  -lFLAC $(XLIB)
 
 test_flac_SOURCES = \
   test_flac.c
@@ -313,7 +317,7 @@
 libextractor_gif_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_gif_la_LIBADD = \
-  -lgif
+  -lgif $(XLIB)
 
 test_gif_SOURCES = \
   test_gif.c
@@ -326,9 +330,9 @@
 libextractor_gstreamer_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_gstreamer_la_LIBADD = \
-  $(GSTREAMER_LIBS) $(GSTREAMER_PBUTILS_LIBS) $(GSTREAMER_TAG_LIBS) 
$(GSTREAMER_APP_LIBS)
+  $(GSTREAMER_LIBS) $(GSTREAMER_PBUTILS_LIBS) $(GSTREAMER_TAG_LIBS) 
$(GSTREAMER_APP_LIBS) $(XLIB)
 libextractor_gstreamer_la_CFLAGS = \
-  $(GSTREAMER_CFLAGS) $(GSTREAMER_PBUTILS_CFLAGS) $(GSTREAMER_TAG_CFLAGS) 
$(GSTREAMER_APP_CFALGS)
+  $(GSTREAMER_CFLAGS) $(GSTREAMER_PBUTILS_CFLAGS) $(GSTREAMER_TAG_CFLAGS) 
$(GSTREAMER_APP_CFALGS) 
 
 test_gstreamer_SOURCES = \
   test_gstreamer.c
@@ -344,7 +348,7 @@
 libextractor_html_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_html_la_LIBADD = \
-  -ltidy -lmagic
+  -ltidy -lmagic $(XLIB)
 
 test_html_SOURCES = \
   test_html.c
@@ -356,6 +360,8 @@
   it_extractor.c
 libextractor_it_la_LDFLAGS = \
   $(PLUGINFLAGS)
+libextractor_it_la_LIBADD = \
+ $(XLIB) 
 
 test_it_SOURCES = \
   test_it.c
@@ -368,7 +374,7 @@
 libextractor_jpeg_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_jpeg_la_LIBADD = \
-  -ljpeg
+  -ljpeg $(XLIB)
 
 test_jpeg_SOURCES = \
   test_jpeg.c
@@ -380,6 +386,8 @@
   man_extractor.c
 libextractor_man_la_LDFLAGS = \
   $(PLUGINFLAGS)
+libextractor_man_la_LIBADD = \
+ $(XLIB) 
 
 test_man_SOURCES = \
   test_man.c
@@ -394,7 +402,7 @@
 libextractor_midi_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_midi_la_LIBADD = \
-  -lsmf
+  -lsmf $(XLIB)
 
 test_midi_SOURCES = \
   test_midi.c
@@ -407,7 +415,7 @@
 libextractor_mime_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_mime_la_LIBADD = \
-  -lmagic
+  -lmagic $(XLIB)
 
 test_mime_SOURCES = \
   test_mime.c
@@ -420,7 +428,7 @@
 libextractor_mp4_la_LDFLAGS = \
   $(PLUGINFLAGS) 
 libextractor_mp4_la_LIBADD = \
-  -lmp4v2
+  -lmp4v2 $(XLIB)
 
 
 libextractor_mpeg_la_SOURCES = \
@@ -428,7 +436,7 @@
 libextractor_mpeg_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_mpeg_la_LIBADD = \
-  -lmpeg2
+  -lmpeg2 $(XLIB)
 
 test_mpeg_SOURCES = \
   test_mpeg.c
@@ -440,6 +448,8 @@
   nsf_extractor.c
 libextractor_nsf_la_LDFLAGS = \
   $(PLUGINFLAGS)
+libextractor_nsf_la_LIBADD = \
+ $(XLIB) 
 
 test_nsf_SOURCES = \
   test_nsf.c
@@ -451,6 +461,8 @@
   nsfe_extractor.c
 libextractor_nsfe_la_LDFLAGS = \
   $(PLUGINFLAGS)
+libextractor_nsfe_la_LIBADD = \
+ $(XLIB) 
 
 test_nsfe_SOURCES = \
   test_nsfe.c
@@ -463,7 +475,7 @@
 libextractor_odf_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_odf_la_LIBADD = \
-  $(top_builddir)/src/common/libextractor_common.la 
+  $(top_builddir)/src/common/libextractor_common.la $(XLIB)
 
 test_odf_SOURCES = \
   test_odf.c
@@ -481,7 +493,7 @@
   $(PLUGINFLAGS) 
 libextractor_ole2_la_LIBADD = \
   $(top_builddir)/src/common/libextractor_common.la \
-  $(GSF_LIBS)
+  $(GSF_LIBS) $(XLIB)
 
 test_ole2_SOURCES = \
   test_ole2.c
@@ -494,7 +506,7 @@
 libextractor_ogg_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_ogg_la_LIBADD = \
-  -lvorbisfile -lvorbis $(vorbisflag) -logg
+  -lvorbisfile -lvorbis $(vorbisflag) -logg $(XLIB)
 
 test_ogg_SOURCES = \
   test_ogg.c
@@ -507,7 +519,7 @@
 libextractor_png_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_png_la_LIBADD = \
-  $(top_builddir)/src/common/libextractor_common.la 
+  $(top_builddir)/src/common/libextractor_common.la $(XLIB)
 
 test_png_SOURCES = \
   test_png.c
@@ -519,6 +531,8 @@
   ps_extractor.c
 libextractor_ps_la_LDFLAGS = \
   $(PLUGINFLAGS)
+libextractor_ps_la_LIBADD = \
+ $(XLIB) 
 
 test_ps_SOURCES = \
   test_ps.c
@@ -531,7 +545,7 @@
 libextractor_riff_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_riff_la_LIBADD = \
-  -lm
+  -lm $(XLIB)
 
 
 test_riff_SOURCES = \
@@ -545,7 +559,7 @@
 libextractor_rpm_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_rpm_la_LIBADD = \
-  -lrpm -lpthread
+  -lrpm -lpthread $(XLIB)
 
 test_rpm_SOURCES = \
   test_rpm.c
@@ -557,6 +571,8 @@
   s3m_extractor.c
 libextractor_s3m_la_LDFLAGS = \
   $(PLUGINFLAGS)
+libextractor_s3m_la_LIBADD = \
+ $(XLIB) 
 
 test_s3m_SOURCES = \
   test_s3m.c
@@ -568,6 +584,8 @@
   sid_extractor.c
 libextractor_sid_la_LDFLAGS = \
   $(PLUGINFLAGS)
+libextractor_sid_la_LIBADD = \
+ $(XLIB) 
 
 test_sid_SOURCES = \
   test_sid.c
@@ -580,7 +598,7 @@
 libextractor_thumbnailffmpeg_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_thumbnailffmpeg_la_LIBADD = \
-  -lavutil -lavformat -lavcodec -lswscale -lmagic
+  -lavutil -lavformat -lavcodec -lswscale -lmagic $(XLIB)
 
 test_thumbnailffmpeg_SOURCES = \
   test_thumbnailffmpeg.c
@@ -595,7 +613,7 @@
 libextractor_thumbnailgtk_la_CFLAGS = \
   $(GTK_CFLAGS)
 libextractor_thumbnailgtk_la_LIBADD = \
-  -lmagic $(GTK_LIBS)
+  -lmagic $(GTK_LIBS) $(XLIB)
 
 test_thumbnailgtk_SOURCES = \
   test_thumbnailgtk.c
@@ -608,7 +626,7 @@
 libextractor_tiff_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_tiff_la_LIBADD = \
-  -ltiff
+  -ltiff $(XLIB)
 
 test_tiff_SOURCES = \
   test_tiff.c
@@ -620,6 +638,8 @@
   wav_extractor.c
 libextractor_wav_la_LDFLAGS = \
   $(PLUGINFLAGS)
+libextractor_wav_la_LIBADD = \
+ $(XLIB) 
 
 test_wav_SOURCES = \
   test_wav.c
@@ -631,6 +651,8 @@
   xm_extractor.c
 libextractor_xm_la_LDFLAGS = \
   $(PLUGINFLAGS)
+libextractor_xm_la_LIBADD = \
+ $(XLIB) 
 
 test_xm_SOURCES = \
   test_xm.c
@@ -643,7 +665,7 @@
 libextractor_zip_la_LDFLAGS = \
   $(PLUGINFLAGS)
 libextractor_zip_la_LIBADD = \
-  $(top_builddir)/src/common/libextractor_common.la 
+  $(top_builddir)/src/common/libextractor_common.la $(XLIB)
 
 test_zip_SOURCES = \
   test_zip.c

Modified: Extractor/src/plugins/fuzz_default.sh
===================================================================
--- Extractor/src/plugins/fuzz_default.sh       2012-09-07 09:07:30 UTC (rev 
23687)
+++ Extractor/src/plugins/fuzz_default.sh       2012-09-07 09:09:31 UTC (rev 
23688)
@@ -2,7 +2,7 @@
 
 ZZSTARTSEED=0
 ZZSTOPSEED=100
-
+ret=0
 # fallbacks for direct, non-"make check" usage
 if test x"$testdatadir" = x""
 then
@@ -29,7 +29,7 @@
       if ! "$bindir/extract" -i "$tmpfile" > /dev/null
       then
         echo "$tmpfile with seed $seed failed"
-        exit 1
+       ret=1
       fi
       seed=`expr $seed + 1`
     done
@@ -37,3 +37,4 @@
   fi
 done
 
+exit $ret