svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers

1 files changed, 13 insertions, 1 deletions

diff --git a/indra/test/llblowfish_tut.cpp b/indra/test/llblowfish_tut.cpp
index 3859d6c3b1..3081ac3855 100644
--- a/indra/test/llblowfish_tut.cpp
+++ b/indra/test/llblowfish_tut.cpp
@@ -93,6 +93,9 @@ namespace tut
 	template<> template<>
 	void blowfish_object::test<1>()
 	{
+#if !LL_LINUX
+		skip_fail("Blowfish only supported on Linux.");
+#else
 		LLUUID blank;
 		LLBlowfishCipher cipher(&blank.mData[0], UUID_BYTES);
 
@@ -105,11 +108,15 @@ namespace tut
 		dst_len = cipher.requiredEncryptionSpace(8);
 		ensure("encryption space 8",
 				(dst_len == 16)  );
+#endif // !LL_LINUX
 	}
 
 	template<> template<>
 	void blowfish_object::test<2>()
 	{
+#if !LL_LINUX
+		skip_fail("Blowfish only supported on Linux.");
+#else
 		LLUUID blank;
 		LLBlowfishCipher cipher(&blank.mData[0], UUID_BYTES);
 
@@ -123,12 +130,16 @@ namespace tut
 		result.resize(count);
 
 		ensure("encrypt null key", matchFile("blowfish.1.bin", result));
+#endif // !LL_LINUX
 	}
 
 	template<> template<>
 	void blowfish_object::test<3>()
 	{
-		// same as base64 test id
+#if !LL_LINUX
+        skip_fail("Blowfish only supported on Linux.");
+#else
+        // same as base64 test id
 		LLUUID id("526a1e07-a19d-baed-84c4-ff08a488d15e");
 		LLBlowfishCipher cipher(&id.mData[0], UUID_BYTES);
 
@@ -142,5 +153,6 @@ namespace tut
 		result.resize(count);
 
 		ensure("encrypt real key", matchFile("blowfish.2.bin", result));
+#endif // !LL_LINUX
 	}
 }