diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2008-12-01 16:34:31 +0000 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2008-12-01 16:34:31 +0000 |
| commit | de7d6cf4dfa1db2945e3ed4a3e8257d72674a496 (patch) | |
| tree | cc379363bd62d7ff6e8bad34f5f588436ca6e799 /indra/test | |
| parent | 64cb981d12bf5f1af20aa124c1d645111da96cf0 (diff) | |
svn merge -r103586:104391 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-4-sandbox-r103546
Picking up the following bug fixes:
DEV-19747 Flooding sim with bogus animation packets crashes sim
DEV-20978 Investigate baked avatar texture caching in simulator - ids not properly stored
DEV-5316 llsd-get .../runtime/top and "World:Region/Estate:Debug:Get Top Scripts" broken
DEV-18807 SVC-2596: Script dataserver events become permanently blocked until sim restart
DEV-19108 SVC-2616: Torus refuses to accept 180 degree texture rotation
DEV-9944 Simulator crash failing to write simstate to file .tmp.tmp
DEV-21439 Configure VFS file size via simulator.xml
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/llblowfish_tut.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/indra/test/llblowfish_tut.cpp b/indra/test/llblowfish_tut.cpp index eb2e4ed0f8..97ed2be760 100644 --- a/indra/test/llblowfish_tut.cpp +++ b/indra/test/llblowfish_tut.cpp @@ -93,9 +93,7 @@ namespace tut template<> template<> void blowfish_object::test<1>() { -#if LL_WINDOWS - skip_fail("Blowfish only supported on Linux."); -#else +#if LL_LINUX LLUUID blank; LLBlowfishCipher cipher(&blank.mData[0], UUID_BYTES); @@ -108,15 +106,15 @@ namespace tut dst_len = cipher.requiredEncryptionSpace(8); ensure("encryption space 8", (dst_len == 16) ); -#endif // LL_WINDOWS +#else + skip_fail("Blowfish only supported on Linux."); +#endif // LL_LINUX } template<> template<> void blowfish_object::test<2>() { -#if LL_WINDOWS - skip_fail("Blowfish only supported on Linux."); -#else +#if LL_LINUX LLUUID blank; LLBlowfishCipher cipher(&blank.mData[0], UUID_BYTES); @@ -130,15 +128,15 @@ namespace tut result.resize(count); ensure("encrypt null key", matchFile("blowfish.1.bin", result)); -#endif // LL_WINDOWS +#else + skip_fail("Blowfish only supported on Linux."); +#endif // LL_LINUX } template<> template<> void blowfish_object::test<3>() { -#if LL_WINDOWS - skip_fail("Blowfish only supported on Linux."); -#else +#if LL_LINUX // same as base64 test id LLUUID id("526a1e07-a19d-baed-84c4-ff08a488d15e"); LLBlowfishCipher cipher(&id.mData[0], UUID_BYTES); @@ -153,6 +151,8 @@ namespace tut result.resize(count); ensure("encrypt real key", matchFile("blowfish.2.bin", result)); -#endif // LL_WINDOWS +#else + skip_fail("Blowfish only supported on Linux."); +#endif // LL_LINUX } } |