X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b4d47ca02c2dced2312c6adfb99fab98972f3b21..17beda75ef9780ebef5044e41889a9b598dcf186:/tests/filekind/filekind.cpp diff --git a/tests/filekind/filekind.cpp b/tests/filekind/filekind.cpp index 9cb2abee33..c948050d39 100644 --- a/tests/filekind/filekind.cpp +++ b/tests/filekind/filekind.cpp @@ -4,7 +4,7 @@ // Author: Mike Wetherell // RCS-ID: $Id$ // Copyright: (c) 2005 Mike Wetherell -// Licence: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #include "testprec.h" @@ -113,7 +113,7 @@ void FileKindTestCase::File() { TempFile tmp; // put first wxFile file; - tmp.m_name = wxFileName::CreateTempFileName(_T("wxft"), &file); + tmp.m_name = wxFileName::CreateTempFileName(wxT("wxft"), &file); TestFd(file, true); file.Close(); @@ -127,11 +127,13 @@ void FileKindTestCase::File() void FileKindTestCase::Pipe() { int afd[2]; + int rc; #ifdef __UNIX__ - pipe(afd); + rc = pipe(afd); #else - _pipe(afd, 256, O_BINARY); + rc = _pipe(afd, 256, O_BINARY); #endif + CPPUNIT_ASSERT_EQUAL_MESSAGE("Failed to create pipe", 0, rc); wxFile file0(afd[0]); wxFile file1(afd[1]); @@ -206,7 +208,7 @@ void FileKindTestCase::Stdin() // register in the unnamed registry so that these tests are run by default CPPUNIT_TEST_SUITE_REGISTRATION(FileKindTestCase); -// also include in it's own registry so that these tests can be run alone +// also include in its own registry so that these tests can be run alone CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(FileKindTestCase, "FileKindTestCase"); #endif // wxUSE_STREAMS