From 9ff99cb543334e0b8e0226beb9e2461960e13bf7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 10 Nov 2012 12:21:46 +0000 Subject: [PATCH] Fix filename test compilation with VC6. Just disable tests resulting in an internal compiler error. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/filename/filenametest.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp index 0e8942129b..10ef920f39 100644 --- a/tests/filename/filenametest.cpp +++ b/tests/filename/filenametest.cpp @@ -673,8 +673,17 @@ void FileNameTestCase::TestExists() CPPUNIT_ASSERT( fn.FileExists() ); CPPUNIT_ASSERT( !wxFileName::DirExists(fn.GetFullPath()) ); + // FIXME-VC6: This compiler crashes with + // + // fatal error C1001: INTERNAL COMPILER ERROR + // (compiler file 'msc1.cpp', line 1794) + // + // when compiling calls to Exists() with parameter for some reason, just + // disable these tests there. +#ifndef __VISUALC6__ CPPUNIT_ASSERT( fn.Exists(wxFILE_EXISTS_REGULAR) ); CPPUNIT_ASSERT( !fn.Exists(wxFILE_EXISTS_DIR) ); +#endif CPPUNIT_ASSERT( fn.Exists() ); const wxString& tempdir = wxFileName::GetTempDir(); @@ -687,8 +696,10 @@ void FileNameTestCase::TestExists() CPPUNIT_ASSERT( !dirTemp.FileExists() ); CPPUNIT_ASSERT( dirTemp.DirExists() ); +#ifndef __VISUALC6__ CPPUNIT_ASSERT( dirTemp.Exists(wxFILE_EXISTS_DIR) ); CPPUNIT_ASSERT( !dirTemp.Exists(wxFILE_EXISTS_REGULAR) ); +#endif CPPUNIT_ASSERT( dirTemp.Exists() ); #ifdef __UNIX__