added wxICON_NONE and implement support for it in wxGTK (closes #2897)

[wxWidgets.git] / tests / archive / ziptest.cpp

diff --git a/tests/archive/ziptest.cpp b/tests/archive/ziptest.cpp
index c6a64a099f7fb333d3b99219c8381f2bae7a439e..4204c7dfb7c0fe67ed7a1f5a72fbf57cfca82905 100644 (file)
--- a/tests/archive/ziptest.cpp
+++ b/tests/archive/ziptest.cpp
@@ -233,8 +233,11 @@ ArchiveTestSuite *ziptest::makeSuite()
 {
     ArchiveTestSuite::makeSuite();
 
 {
     ArchiveTestSuite::makeSuite();
 

-#ifndef WXARC_NO_POPEN 
-    // if have popen then can check the piped output of 'zip - -'
+#if !defined WXARC_NO_POPEN && !defined __WXMSW__
+    // If have popen then can check the piped output of 'zip - -'.
+    // The gnuwin32 build of infozip does work for this, e.g.:
+    //  C:\>echo test data to pipe through zip | zip -q > foo.zip 
+    // doesn't produce a valid zip, so disabled for now.

     if (IsInPath(_T("zip")))
         for (int options = 0; options <= PipeIn; options += PipeIn) {
             string name = Description(_T("ZipPipeTestCase"), options,
     if (IsInPath(_T("zip")))
         for (int options = 0; options <= PipeIn; options += PipeIn) {
             string name = Description(_T("ZipPipeTestCase"), options,


@@ -258,11 +261,13 @@ CppUnit::Test *ziptest::makeTest(
         return NULL;
 
     if (genericInterface)
         return NULL;
 
     if (genericInterface)

+    {

         return new ArchiveTestCase<wxArchiveClassFactory>(
                             descr, new wxZipClassFactory,
                             options, archiver, unarchiver);
         return new ArchiveTestCase<wxArchiveClassFactory>(
                             descr, new wxZipClassFactory,
                             options, archiver, unarchiver);

-    else
-        return new ZipTestCase(descr, options, archiver, unarchiver);
+    }
+
+    return new ZipTestCase(descr, options, archiver, unarchiver);

 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ziptest);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ziptest);