Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for archive tests on Windows.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2009-04-04 22:12:04 +00:00
parent 245ff47f7c
commit cc90c1cc3e
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/archive/archivetest.cpp
View File

@@ -804,10 +804,14 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in)
const TestEntry& testEntry = *it->second; 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(); wxDateTime dt = testEntry.GetDateTime();
if (dt.IsValid()) if (dt.IsValid())
CPPUNIT_ASSERT_MESSAGE("timestamp check" + error_context, CPPUNIT_ASSERT_MESSAGE("timestamp check" + error_context,
dt == entry->GetDateTime()); dt == entry->GetDateTime());
#endif
// non-seekable entries are allowed to have GetSize == wxInvalidOffset // non-seekable entries are allowed to have GetSize == wxInvalidOffset
// until the end of the entry's data has been read past // until the end of the entry's data has been read past

7
tests/archive/ziptest.cpp
View File

@@ -233,8 +233,11 @@ ArchiveTestSuite *ziptest::makeSuite()
{ {
ArchiveTestSuite::makeSuite(); ArchiveTestSuite::makeSuite();
#ifndef WXARC_NO_POPEN #if !defined WXARC_NO_POPEN && !defined __WXMSW__
// if have popen then can check the piped output of 'zip - -' // 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"))) if (IsInPath(_T("zip")))
for (int options = 0; options <= PipeIn; options += PipeIn) { for (int options = 0; options <= PipeIn; options += PipeIn) {
string name = Description(_T("ZipPipeTestCase"), options, string name = Description(_T("ZipPipeTestCase"), options,