Fixes for archive tests on Windows.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp
index 1d8853945a9468d1720c964d5b4b1ebbaa8f9f79..83d85a2a2d499a693ea7f8401e255804da17a53a 100644 (file)
--- a/tests/archive/archivetest.cpp
+++ b/tests/archive/archivetest.cpp
@@ -804,10 +804,14 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in)
 
         const TestEntry& testEntry = *it->second;
 
+#ifndef __WXMSW__
+        // On Windows some archivers compensate for Windows DST handling, but
+        // other don't, so disable the test for now.
         wxDateTime dt = testEntry.GetDateTime();
         if (dt.IsValid())
             CPPUNIT_ASSERT_MESSAGE("timestamp check" + error_context,
                                    dt == entry->GetDateTime());
+#endif
 
         // non-seekable entries are allowed to have GetSize == wxInvalidOffset
         // until the end of the entry's data has been read past

diff --git a/tests/archive/ziptest.cpp b/tests/archive/ziptest.cpp
index c6a64a099f7fb333d3b99219c8381f2bae7a439e..966e6e78a0b5e4e87d8a03e0ef97d363c0283a90 100644 (file)
--- a/tests/archive/ziptest.cpp
+++ b/tests/archive/ziptest.cpp
@@ -233,8 +233,11 @@ ArchiveTestSuite *ziptest::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,