From 8e07bd3faf25c0eee5766041327d50b03e97684c Mon Sep 17 00:00:00 2001
From: Tyler Dauwalder <tylerdauwalder@nowhere.fake>
Date: Sun, 27 Oct 2002 02:40:06 +0000
Subject: [PATCH] #ifdef'd out R5 versions of tests that tried to use functions
 not found in R5 version of the Storage Kit.

This appears to fix the BSymLink linking errors, at least as a temporary
fix.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1713 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/tests/kits/storage/DirectoryTest.cpp |  4 ++++
 src/tests/kits/storage/SymLinkTest.cpp   | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/src/tests/kits/storage/DirectoryTest.cpp b/src/tests/kits/storage/DirectoryTest.cpp
index 7d53b41d66..2d7fc32d94 100644
--- a/src/tests/kits/storage/DirectoryTest.cpp
+++ b/src/tests/kits/storage/DirectoryTest.cpp
@@ -1343,6 +1343,9 @@ DirectoryTest::EntryIterationTest()
 void
 DirectoryTest::EntryCreationTest()
 {
+#ifdef TEST_R5
+	Outputf("(test currently omitted due to build errors related to BSymLink::SetTo())\n");
+#else
 	const char *existingFile = existingFilename;
 	const char *existing = existingDirname;
 	const char *testDir1 = testDirname1;
@@ -1682,6 +1685,7 @@ DirectoryTest::EntryCreationTest()
 	NextSubTest();
 	CPPUNIT_ASSERT( dir.CreateSymLink(entryName.c_str(), existingFile, NULL)
 					== B_FILE_EXISTS );
+#endif // ifndef TEST_R5
 }
 
 // AssignmentTest
diff --git a/src/tests/kits/storage/SymLinkTest.cpp b/src/tests/kits/storage/SymLinkTest.cpp
index da28fc1eeb..83a29de600 100644
--- a/src/tests/kits/storage/SymLinkTest.cpp
+++ b/src/tests/kits/storage/SymLinkTest.cpp
@@ -318,6 +318,9 @@ 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;
@@ -487,12 +490,16 @@ 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;
@@ -561,12 +568,17 @@ 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;
@@ -789,12 +801,17 @@ 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;
@@ -831,12 +848,16 @@ 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
@@ -900,6 +921,7 @@ SymLinkTest::AssignmentTest()
 		link2 = link;
 		CPPUNIT_ASSERT( link2.InitCheck() == B_OK );
 	}
+#endif // ifdef TEST_R5 else
 }