X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58263bb4c371f36d114fb366df9197cf8ec07c4c..17beda75ef9780ebef5044e41889a9b598dcf186:/tests/filename/filenametest.cpp diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp index a9d2396d19..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__ @@ -702,13 +713,15 @@ void FileNameTestCase::TestExists() CPPUNIT_ASSERT( wxFileName::Exists("/dev/core", wxFILE_EXISTS_SYMLINK) ); CPPUNIT_ASSERT( wxFileName::Exists("/dev/log", wxFILE_EXISTS_SOCKET) ); #endif // __LINUX__ +#ifndef __VMS wxString fifo = dirTemp.GetPath() + "/fifo"; - if (mkfifo(fifo.c_str(), 0600) == 0) + if (mkfifo(fifo.c_str(), 0600) == 0) { wxON_BLOCK_EXIT1(wxRemoveFile, fifo); CPPUNIT_ASSERT( wxFileName::Exists(fifo, wxFILE_EXISTS_FIFO) ); } +#endif #endif // __UNIX__ } @@ -773,9 +786,15 @@ void FileNameTestCase::TestSymlinks() CPPUNIT_ASSERT(tmpfn.GetTimes(&dtAccessTmp, &dtModTmp, &dtCreateTmp)); // Create a temporary directory +#ifdef __VMS + wxString name = tmpdir + ".filenametestXXXXXX]"; + mkdir( name.char_str() , 0222 ); + wxString tempdir = name; +#else wxString name = tmpdir + "/filenametestXXXXXX"; wxString tempdir = wxString::From8BitData(mkdtemp(name.char_str())); tempdir << wxFileName::GetPathSeparator(); +#endif wxFileName tempdirfn(wxFileName::DirName(tempdir)); CPPUNIT_ASSERT(tempdirfn.DirExists());