From f9a99e4bfeefaaef0d3f4b8ebd8e9be55f1d4a7c Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 23 Mar 2015 21:47:34 +0000 Subject: -adjust to make testcase not fail with old libmagic versions --- src/plugins/Makefile.am | 53 ++++++------ src/plugins/test_mime.c | 20 +++-- src/plugins/test_ole2.c | 214 ++++++++++++++++++++++++------------------------ 3 files changed, 149 insertions(+), 138 deletions(-) (limited to 'src') diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index 15dfd33..3b6e0f7 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -1,7 +1,7 @@ # This Makefile.am is in the public domain INCLUDES = \ -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/common + -I$(top_srcdir)/src/common # install plugins under: @@ -18,7 +18,7 @@ endif PLUGINFLAGS = $(makesymbolic) $(LE_PLUGIN_LDFLAGS) -SUBDIRS = . +SUBDIRS = . EXTRA_DIST = \ fuzz_default.sh \ @@ -201,10 +201,10 @@ plugin_LTLIBRARIES = \ $(PLUGIN_PREVIEWOPUS) \ $(PLUGIN_RPM) \ $(PLUGIN_TIFF) \ - $(PLUGIN_ZLIB) + $(PLUGIN_ZLIB) if HAVE_ZZUF - fuzz_tests=fuzz_default.sh + fuzz_tests=fuzz_default.sh endif check_PROGRAMS = \ @@ -239,7 +239,7 @@ check_PROGRAMS = \ $(TEST_OGG) \ $(TEST_RPM) \ $(TEST_TIFF) \ - $(TEST_ZLIB) + $(TEST_ZLIB) if ENABLE_TEST_RUN TESTS = \ @@ -253,7 +253,7 @@ noinst_LTLIBRARIES = \ libtest_la_SOURCES = \ test_lib.c test_lib.h libtest_la_LIBADD = \ - $(top_builddir)/src/main/libextractor.la $(XLIB) + $(top_builddir)/src/main/libextractor.la $(XLIB) libextractor_archive_la_SOURCES = \ @@ -261,7 +261,7 @@ libextractor_archive_la_SOURCES = \ libextractor_archive_la_LDFLAGS = \ $(PLUGINFLAGS) libextractor_archive_la_LIBADD = \ - -larchive $(XLIB) + -larchive $(XLIB) test_archive_SOURCES = \ test_archive.c @@ -274,7 +274,7 @@ libextractor_deb_la_SOURCES = \ libextractor_deb_la_LDFLAGS = \ $(PLUGINFLAGS) -lz libextractor_deb_la_LIBADD = \ - $(XLIB) + $(XLIB) test_deb_SOURCES = \ test_deb.c @@ -313,7 +313,7 @@ libextractor_flac_la_SOURCES = \ libextractor_flac_la_LDFLAGS = \ $(PLUGINFLAGS) libextractor_flac_la_LIBADD = \ - -lFLAC $(XLIB) $(LE_LIBINTL) + -lFLAC $(XLIB) $(LE_LIBINTL) test_flac_SOURCES = \ test_flac.c @@ -341,7 +341,7 @@ libextractor_gstreamer_la_LDFLAGS = \ libextractor_gstreamer_la_LIBADD = \ $(GSTREAMER_LIBS) $(GSTREAMER_PBUTILS_LIBS) $(GSTREAMER_TAG_LIBS) $(GSTREAMER_APP_LIBS) $(XLIB) -lpthread 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 @@ -370,7 +370,7 @@ libextractor_it_la_SOURCES = \ libextractor_it_la_LDFLAGS = \ $(PLUGINFLAGS) libextractor_it_la_LIBADD = \ - $(XLIB) + $(XLIB) test_it_SOURCES = \ test_it.c @@ -396,13 +396,13 @@ libextractor_man_la_SOURCES = \ libextractor_man_la_LDFLAGS = \ $(PLUGINFLAGS) libextractor_man_la_LIBADD = \ - $(XLIB) $(LE_LIBINTL) + $(XLIB) $(LE_LIBINTL) test_man_SOURCES = \ test_man.c test_man_LDADD = \ $(top_builddir)/src/plugins/libtest.la \ - $(LE_LIBINTL) + $(LE_LIBINTL) libextractor_midi_la_SOURCES = \ @@ -436,7 +436,7 @@ test_mime_LDADD = \ libextractor_mp4_la_SOURCES = \ mp4_extractor.c libextractor_mp4_la_LDFLAGS = \ - $(PLUGINFLAGS) + $(PLUGINFLAGS) libextractor_mp4_la_LIBADD = \ -lmp4v2 $(XLIB) @@ -459,7 +459,7 @@ libextractor_nsf_la_SOURCES = \ libextractor_nsf_la_LDFLAGS = \ $(PLUGINFLAGS) libextractor_nsf_la_LIBADD = \ - $(XLIB) + $(XLIB) test_nsf_SOURCES = \ test_nsf.c @@ -472,7 +472,7 @@ libextractor_nsfe_la_SOURCES = \ libextractor_nsfe_la_LDFLAGS = \ $(PLUGINFLAGS) libextractor_nsfe_la_LIBADD = \ - $(XLIB) + $(XLIB) test_nsfe_SOURCES = \ test_nsfe.c @@ -500,10 +500,10 @@ libextractor_ole2_la_CFLAGS = \ libextractor_ole2_la_CPPFLAGS = \ $(GSF_CFLAGS) libextractor_ole2_la_LDFLAGS = \ - $(PLUGINFLAGS) + $(PLUGINFLAGS) libextractor_ole2_la_LIBADD = \ $(top_builddir)/src/common/libextractor_common.la \ - $(GSF_LIBS) $(XLIB) $(LE_LIBINTL) + $(GSF_LIBS) $(XLIB) $(LE_LIBINTL) test_ole2_SOURCES = \ test_ole2.c @@ -542,7 +542,7 @@ libextractor_ps_la_SOURCES = \ libextractor_ps_la_LDFLAGS = \ $(PLUGINFLAGS) libextractor_ps_la_LIBADD = \ - $(XLIB) + $(XLIB) test_ps_SOURCES = \ test_ps.c @@ -555,7 +555,7 @@ libextractor_riff_la_SOURCES = \ libextractor_riff_la_LDFLAGS = \ $(PLUGINFLAGS) libextractor_riff_la_LIBADD = \ - -lm $(XLIB) $(LE_LIBINTL) + -lm $(XLIB) $(LE_LIBINTL) test_riff_SOURCES = \ @@ -582,7 +582,7 @@ libextractor_s3m_la_SOURCES = \ libextractor_s3m_la_LDFLAGS = \ $(PLUGINFLAGS) libextractor_s3m_la_LIBADD = \ - $(XLIB) + $(XLIB) test_s3m_SOURCES = \ test_s3m.c @@ -595,7 +595,7 @@ libextractor_sid_la_SOURCES = \ libextractor_sid_la_LDFLAGS = \ $(PLUGINFLAGS) libextractor_sid_la_LIBADD = \ - $(XLIB) + $(XLIB) test_sid_SOURCES = \ test_sid.c @@ -636,13 +636,13 @@ libextractor_previewopus_la_LDFLAGS = \ $(PLUGINFLAGS) libextractor_previewopus_la_LIBADD = \ -lavutil -lavformat -lavcodec -lswscale -lavresample -lmagic $(XLIB) - + test_previewopus_SOURCES = \ test_previewopus.c test_previewopus_LDADD = \ $(top_builddir)/src/plugins/libtest.la - + libextractor_tiff_la_SOURCES = \ tiff_extractor.c libextractor_tiff_la_LDFLAGS = \ @@ -661,7 +661,7 @@ libextractor_wav_la_SOURCES = \ libextractor_wav_la_LDFLAGS = \ $(PLUGINFLAGS) libextractor_wav_la_LIBADD = \ - $(XLIB) $(LE_LIBINTL) + $(XLIB) $(LE_LIBINTL) test_wav_SOURCES = \ test_wav.c @@ -674,7 +674,7 @@ libextractor_xm_la_SOURCES = \ libextractor_xm_la_LDFLAGS = \ $(PLUGINFLAGS) libextractor_xm_la_LIBADD = \ - $(XLIB) + $(XLIB) test_xm_SOURCES = \ test_xm.c @@ -693,4 +693,3 @@ test_zip_SOURCES = \ test_zip.c test_zip_LDADD = \ $(top_builddir)/src/plugins/libtest.la - diff --git a/src/plugins/test_mime.c b/src/plugins/test_mime.c index 41e8086..67cf1aa 100644 --- a/src/plugins/test_mime.c +++ b/src/plugins/test_mime.c @@ -24,7 +24,7 @@ */ #include "platform.h" #include "test_lib.h" - +#include /** @@ -39,25 +39,35 @@ main (int argc, char *argv[]) { struct SolutionData courseclear_sol[] = { - { + { EXTRACTOR_METATYPE_MIMETYPE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", + /* not sure which is the exact version, but old ones do + not even define MAGIC_VERSION, so this is approximately + right. Users where this tests fail should report + their version number from "magic.h" so we can adjust + if necessary. */ +#ifdef MAGIC_VERSION "audio/ogg", strlen ("audio/ogg") + 1, - 0 +#else + "application/ogg", + strlen ("application/ogg") + 1, +#endif + 0 }, { 0, 0, NULL, NULL, 0, -1 } }; struct SolutionData gif_image_sol[] = { - { + { EXTRACTOR_METATYPE_MIMETYPE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "image/gif", strlen ("image/gif") + 1, - 0 + 0 }, { 0, 0, NULL, NULL, 0, -1 } }; diff --git a/src/plugins/test_ole2.c b/src/plugins/test_ole2.c index aed0059..2ad7958 100644 --- a/src/plugins/test_ole2.c +++ b/src/plugins/test_ole2.c @@ -38,436 +38,436 @@ main (int argc, char *argv[]) { struct SolutionData ole2_msword_sol[] = { - { + { EXTRACTOR_METATYPE_CREATOR, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Nils Durner", strlen ("Nils Durner") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_UNKNOWN_DATE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "2005-03-21T06:11:12Z", strlen ("2005-03-21T06:11:12Z") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_DESCRIPTION, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "This is a small document to test meta data extraction by GNU libextractor.", strlen ("This is a small document to test meta data extraction by GNU libextractor.") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_KEYWORDS, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "ole ole2 eole2extractor", strlen ("ole ole2 eole2extractor") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_SUBJECT, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "GNU libextractor", strlen ("GNU libextractor") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_TITLE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Testcase for the ole2 extractor", strlen ("Testcase for the ole2 extractor") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_LAST_SAVED_BY, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Nils Durner", strlen ("Nils Durner") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_CREATION_DATE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "2005-03-21T06:10:19Z", strlen ("2005-03-21T06:10:19Z") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_EDITING_CYCLES, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "2", strlen ("2") + 1, - 0 + 0 }, { 0, 0, NULL, NULL, 0, -1 } }; struct SolutionData ole2_starwriter_sol[] = { - { + { EXTRACTOR_METATYPE_CREATOR, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Christian Grothoff", strlen ("Christian Grothoff") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_UNKNOWN_DATE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "2004-09-24T02:54:31Z", strlen ("2004-09-24T02:54:31Z") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_DESCRIPTION, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "The comments", strlen ("The comments") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_KEYWORDS, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "The Keywords", strlen ("The Keywords") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_SUBJECT, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "The Subject", strlen ("The Subject") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_TITLE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "The Title", strlen ("The Title") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_LAST_SAVED_BY, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Christian Grothoff", strlen ("Christian Grothoff") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_CREATION_DATE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "2004-09-24T02:53:15Z", strlen ("2004-09-24T02:53:15Z") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_EDITING_CYCLES, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "4", strlen ("4") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_TITLE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "The Title", strlen ("The Title") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_SUBJECT, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "The Subject", strlen ("The Subject") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_COMMENT, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "The comments", strlen ("The comments") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_KEYWORDS, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "The Keywords", strlen ("The Keywords") + 1, - 0 + 0 }, { 0, 0, NULL, NULL, 0, -1 } }; - +#if HAVE_ICONV struct SolutionData ole2_blair_sol[] = { - { + { EXTRACTOR_METATYPE_LANGUAGE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "U.S. English", strlen ("U.S. English") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_CREATOR, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "default", strlen ("default") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_UNKNOWN_DATE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "2003-02-03T11:18:00Z", strlen ("2003-02-03T11:18:00Z") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_TITLE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Iraq- ITS INFRASTRUCTURE OF CONCEALMENT, DECEPTION AND INTIMIDATION", strlen ("Iraq- ITS INFRASTRUCTURE OF CONCEALMENT, DECEPTION AND INTIMIDATION") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_CHARACTER_COUNT, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "22090", strlen ("22090") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_LAST_SAVED_BY, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "MKhan", strlen ("MKhan") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_PAGE_COUNT, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "1", strlen ("1") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_WORD_COUNT, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "3875", strlen ("3875") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_CREATION_DATE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "2003-02-03T09:31:00Z", strlen ("2003-02-03T09:31:00Z") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_EDITING_CYCLES, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "4", strlen ("4") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_MIMETYPE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "application/vnd.ms-files", strlen ("application/vnd.ms-files") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Microsoft Word 8.0", strlen ("Microsoft Word 8.0") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_TEMPLATE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Normal.dot", strlen ("Normal.dot") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_LINE_COUNT, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "184", strlen ("184") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_PARAGRAPH_COUNT, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "44", strlen ("44") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_REVISION_HISTORY, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Revision #0: Author `cic22' worked on `C:\\DOCUME~1\\phamill\\LOCALS~1\\Temp\\AutoRecovery save of Iraq - security.asd'", strlen ("Revision #0: Author `cic22' worked on `C:\\DOCUME~1\\phamill\\LOCALS~1\\Temp\\AutoRecovery save of Iraq - security.asd'") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_REVISION_HISTORY, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Revision #1: Author `cic22' worked on `C:\\DOCUME~1\\phamill\\LOCALS~1\\Temp\\AutoRecovery save of Iraq - security.asd'", strlen ("Revision #1: Author `cic22' worked on `C:\\DOCUME~1\\phamill\\LOCALS~1\\Temp\\AutoRecovery save of Iraq - security.asd'") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_REVISION_HISTORY, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Revision #2: Author `cic22' worked on `C:\\DOCUME~1\\phamill\\LOCALS~1\\Temp\\AutoRecovery save of Iraq - security.asd'", strlen ("Revision #2: Author `cic22' worked on `C:\\DOCUME~1\\phamill\\LOCALS~1\\Temp\\AutoRecovery save of Iraq - security.asd'") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_REVISION_HISTORY, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Revision #3: Author `JPratt' worked on `C:\\TEMP\\Iraq - security.doc'", strlen ("Revision #3: Author `JPratt' worked on `C:\\TEMP\\Iraq - security.doc'") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_REVISION_HISTORY, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Revision #4: Author `JPratt' worked on `A:\\Iraq - security.doc'", strlen ("Revision #4: Author `JPratt' worked on `A:\\Iraq - security.doc'") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_REVISION_HISTORY, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Revision #5: Author `ablackshaw' worked on `C:\\ABlackshaw\\Iraq - security.doc'", strlen ("Revision #5: Author `ablackshaw' worked on `C:\\ABlackshaw\\Iraq - security.doc'") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_REVISION_HISTORY, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Revision #6: Author `ablackshaw' worked on `C:\\ABlackshaw\\A;Iraq - security.doc'", strlen ("Revision #6: Author `ablackshaw' worked on `C:\\ABlackshaw\\A;Iraq - security.doc'") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_REVISION_HISTORY, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Revision #7: Author `ablackshaw' worked on `A:\\Iraq - security.doc'", strlen ("Revision #7: Author `ablackshaw' worked on `A:\\Iraq - security.doc'") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_REVISION_HISTORY, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Revision #8: Author `MKhan' worked on `C:\\TEMP\\Iraq - security.doc'", strlen ("Revision #8: Author `MKhan' worked on `C:\\TEMP\\Iraq - security.doc'") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_REVISION_HISTORY, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Revision #9: Author `MKhan' worked on `C:\\WINNT\\Profiles\\mkhan\\Desktop\\Iraq.doc'", strlen ("Revision #9: Author `MKhan' worked on `C:\\WINNT\\Profiles\\mkhan\\Desktop\\Iraq.doc'") + 1, - 0 + 0 }, { 0, 0, NULL, NULL, 0, -1 } }; - +#endif struct SolutionData ole2_excel_sol[] = { - { + { EXTRACTOR_METATYPE_CREATOR, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "JV", strlen ("JV") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_LAST_SAVED_BY, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "JV", strlen ("JV") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_CREATION_DATE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "2002-03-20T21:26:28Z", strlen ("2002-03-20T21:26:28Z") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_MIMETYPE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "application/vnd.ms-files", strlen ("application/vnd.ms-files") + 1, - 0 + 0 }, - { + { EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "Microsoft Excel", strlen ("Microsoft Excel") + 1, - 0 + 0 }, { 0, 0, NULL, NULL, 0, -1 } }; @@ -478,8 +478,10 @@ main (int argc, char *argv[]) ole2_msword_sol }, { "testdata/ole2_starwriter40.sdw", ole2_starwriter_sol }, +#if HAVE_ICONV { "testdata/ole2_blair.doc", ole2_blair_sol }, +#endif { "testdata/ole2_excel.xls", ole2_excel_sol }, { NULL, NULL } -- cgit v1.2.3