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

Fix filename test compilation with VC6.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2012-11-10 12:21:46 +00:00
parent 1bc5ddea15
commit 9ff99cb543
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/filename/filenametest.cpp
View File

@@ -673,8 +673,17 @@ void FileNameTestCase::TestExists()
CPPUNIT_ASSERT( fn.FileExists() ); CPPUNIT_ASSERT( fn.FileExists() );
CPPUNIT_ASSERT( !wxFileName::DirExists(fn.GetFullPath()) ); 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_REGULAR) );
CPPUNIT_ASSERT( !fn.Exists(wxFILE_EXISTS_DIR) ); CPPUNIT_ASSERT( !fn.Exists(wxFILE_EXISTS_DIR) );
#endif
CPPUNIT_ASSERT( fn.Exists() ); CPPUNIT_ASSERT( fn.Exists() );
const wxString& tempdir = wxFileName::GetTempDir(); const wxString& tempdir = wxFileName::GetTempDir();
@@ -687,8 +696,10 @@ void FileNameTestCase::TestExists()
CPPUNIT_ASSERT( !dirTemp.FileExists() ); CPPUNIT_ASSERT( !dirTemp.FileExists() );
CPPUNIT_ASSERT( dirTemp.DirExists() ); CPPUNIT_ASSERT( dirTemp.DirExists() );
#ifndef __VISUALC6__
CPPUNIT_ASSERT( dirTemp.Exists(wxFILE_EXISTS_DIR) ); CPPUNIT_ASSERT( dirTemp.Exists(wxFILE_EXISTS_DIR) );
CPPUNIT_ASSERT( !dirTemp.Exists(wxFILE_EXISTS_REGULAR) ); CPPUNIT_ASSERT( !dirTemp.Exists(wxFILE_EXISTS_REGULAR) );
#endif
CPPUNIT_ASSERT( dirTemp.Exists() ); CPPUNIT_ASSERT( dirTemp.Exists() );
#ifdef __UNIX__ #ifdef __UNIX__