diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp index 1d8853945a..83d85a2a2d 100644 --- a/tests/archive/archivetest.cpp +++ b/tests/archive/archivetest.cpp @@ -804,10 +804,14 @@ void ArchiveTestCase::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 c6a64a099f..966e6e78a0 100644 --- 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,