From: Vadim Zeitlin Date: Sun, 15 Jan 2012 12:28:57 +0000 (+0000) Subject: Fix unit test build with wxUSE_ZIPSTREAM or wxUSE_TARSTREAM == 0. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2db3b9a6a40343d0a2b6c5008e5ed9768f4a7358 Fix unit test build with wxUSE_ZIPSTREAM or wxUSE_TARSTREAM == 0. Disable the tests using wxZipEntry when it's unavailable. Also do the same for wxTarEntry. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/tests/misc/misctests.cpp b/tests/misc/misctests.cpp index fed7b1e4ff..d50f0a2460 100644 --- a/tests/misc/misctests.cpp +++ b/tests/misc/misctests.cpp @@ -115,17 +115,21 @@ bool IsNull(void *p) void MiscTestCase::StaticCast() { +#if wxUSE_TARSTREAM wxTarEntry tarEntry; CPPUNIT_ASSERT( wxStaticCast(&tarEntry, wxArchiveEntry) ); wxArchiveEntry *entry = &tarEntry; CPPUNIT_ASSERT( wxStaticCast(entry, wxTarEntry) ); +#if wxUSE_ZIPSTREAM wxZipEntry zipEntry; entry = &zipEntry; CPPUNIT_ASSERT( wxStaticCast(entry, wxZipEntry) ); + WX_ASSERT_FAILS_WITH_ASSERT( IsNull(wxStaticCast(&zipEntry, wxTarEntry)) ); +#endif // wxUSE_ZIPSTREAM WX_ASSERT_FAILS_WITH_ASSERT( IsNull(wxStaticCast(entry, wxTarEntry)) ); - WX_ASSERT_FAILS_WITH_ASSERT( IsNull(wxStaticCast(&zipEntry, wxTarEntry)) ); +#endif // wxUSE_TARSTREAM }