Reverted to previous version. The tests do compile and link again.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1949 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -318,9 +318,6 @@ SymLinkTest::InitTest1()
|
||||
void
|
||||
SymLinkTest::InitTest2()
|
||||
{
|
||||
#ifdef TEST_R5
|
||||
Outputf("(test currently omitted due to build errors related to BSymLink::SetTo() and BSymLink::Unset())\n");
|
||||
#else
|
||||
const char *dirLink = dirLinkname;
|
||||
const char *dirSuperLink = dirSuperLinkname;
|
||||
const char *dirRelLink = dirRelLinkname;
|
||||
@@ -490,16 +487,12 @@ SymLinkTest::InitTest2()
|
||||
CPPUNIT_ASSERT( pathDir.SetTo(fileSuperDirname) == B_OK );
|
||||
CPPUNIT_ASSERT( link.SetTo(&pathDir, fileRelDirname) == B_ENTRY_NOT_FOUND );
|
||||
CPPUNIT_ASSERT( link.InitCheck() == B_ENTRY_NOT_FOUND );
|
||||
#endif
|
||||
}
|
||||
|
||||
// ReadLinkTest
|
||||
void
|
||||
SymLinkTest::ReadLinkTest()
|
||||
{
|
||||
#ifdef TEST_R5
|
||||
Outputf("(test currently omitted due to build errors related to BSymLink::SetTo())\n");
|
||||
#else
|
||||
const char *dirLink = dirLinkname;
|
||||
const char *fileLink = fileLinkname;
|
||||
const char *badLink = badLinkname;
|
||||
@@ -568,17 +561,12 @@ SymLinkTest::ReadLinkTest()
|
||||
CPPUNIT_ASSERT( link.SetTo(fileLink) == B_OK );
|
||||
CPPUNIT_ASSERT( equals(link.ReadLink(NULL, sizeof(buffer)), B_BAD_ADDRESS,
|
||||
B_BAD_VALUE) );
|
||||
#endif
|
||||
}
|
||||
|
||||
// MakeLinkedPathTest
|
||||
void
|
||||
SymLinkTest::MakeLinkedPathTest()
|
||||
{
|
||||
#ifdef TEST_R5
|
||||
Outputf("(test currently omitted due to build errors related to "
|
||||
"BSymLink::SetTo() and BSymLink::Unset())\n");
|
||||
#else
|
||||
const char *dirLink = dirLinkname;
|
||||
const char *fileLink = fileLinkname;
|
||||
const char *relDirLink = relDirLinkname;
|
||||
@@ -801,17 +789,12 @@ SymLinkTest::MakeLinkedPathTest()
|
||||
link.Unset();
|
||||
path.Unset();
|
||||
dir.Unset();
|
||||
#endif // ifdef TEST_R5 else
|
||||
}
|
||||
|
||||
// IsAbsoluteTest
|
||||
void
|
||||
SymLinkTest::IsAbsoluteTest()
|
||||
{
|
||||
#ifdef TEST_R5
|
||||
Outputf("(test currently omitted due to build errors "
|
||||
"related to BSymLink::SetTo() and BSymLink::Unset())\n");
|
||||
#else
|
||||
const char *dirLink = dirLinkname;
|
||||
const char *relFileLink = relFileLinkname;
|
||||
const char *existingDir = existingDirname;
|
||||
@@ -848,16 +831,12 @@ SymLinkTest::IsAbsoluteTest()
|
||||
CPPUNIT_ASSERT( link.SetTo(existingFile) == B_OK );
|
||||
CPPUNIT_ASSERT( link.IsAbsolute() == false );
|
||||
link.Unset();
|
||||
#endif // ifdef TEST_R5 else
|
||||
}
|
||||
|
||||
// AssignmentTest
|
||||
void
|
||||
SymLinkTest::AssignmentTest()
|
||||
{
|
||||
#ifdef TEST_R5
|
||||
Outputf("(test currently omitted due to build errors related to BSymLink::operator=())\n");
|
||||
#else
|
||||
const char *dirLink = dirLinkname;
|
||||
const char *fileLink = fileLinkname;
|
||||
// 1. copy constructor
|
||||
@@ -921,11 +900,5 @@ SymLinkTest::AssignmentTest()
|
||||
link2 = link;
|
||||
CPPUNIT_ASSERT( link2.InitCheck() == B_OK );
|
||||
}
|
||||
#endif // ifdef TEST_R5 else
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user