livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Result of svn merge -r105061:106057 svn+ssh://svn/svn/user/phoenix/upgrade-tut into trunk. QAR-1074

master
Aaron Brashears 2008-12-18 01:30:09 +00:00
parent a8d88418ce
commit 0a5c9731fd
19 changed files with 58 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/test/llblowfish_tut.cpp
View File

@ -107,7 +107,7 @@ namespace tut
ensure("encryption space 8",
(dst_len == 16) );
#else
skip_fail("Blowfish only supported on Linux.");
skip("Blowfish only supported on Linux.");
#endif // LL_LINUX
}
@ -129,7 +129,7 @@ namespace tut
ensure("encrypt null key", matchFile("blowfish.1.bin", result));
#else
skip_fail("Blowfish only supported on Linux.");
skip("Blowfish only supported on Linux.");
#endif // LL_LINUX
}
@ -152,7 +152,7 @@ namespace tut
ensure("encrypt real key", matchFile("blowfish.2.bin", result));
#else
skip_fail("Blowfish only supported on Linux.");
skip("Blowfish only supported on Linux.");
#endif // LL_LINUX
}
}

2
indra/test/llbuffer_tut.cpp
View File

@ -31,7 +31,7 @@
* $/LicenseInfo$
*/
#include <tut/tut.h>
#include <tut/tut.hpp>
#include "linden_common.h"
#include "lltut.h"
#include "llbuffer.h"

2
indra/test/lldatapacker_tut.cpp
View File

@ -31,7 +31,7 @@
* $/LicenseInfo$
*/
#include <tut/tut.h>
#include <tut/tut.hpp>
#include "lltut.h"
#include "linden_common.h"
#include "lldatapacker.h"

4
indra/test/llhttpclient_tut.cpp
View File

@ -35,7 +35,7 @@
*
*/
#include <tut/tut.h>
#include <tut/tut.hpp>
#include "linden_common.h"
// These are too slow on Windows to actually include in the build. JC
@ -345,7 +345,7 @@ namespace tut
// won't ever let it run. Instead get from a known LLSD
// source and compare results with the non-blocking get which
// is tested against the mini server earlier.
skip_fail("secondlife.com is not reliable enough for unit tests.");
skip("secondlife.com is not reliable enough for unit tests.");
LLSD expected;

2
indra/test/llpermissions_tut.cpp
View File

@ -31,7 +31,7 @@
* $/LicenseInfo$
*/
#include <tut/tut.h>
#include <tut/tut.hpp>
#include "linden_common.h"
#include "lltut.h"
#include "message.h"

2
indra/test/llsaleinfo_tut.cpp
View File

@ -31,7 +31,7 @@
* $/LicenseInfo$
*/
#include <tut/tut.h>
#include <tut/tut.hpp>
#include "linden_common.h"
#include "lltut.h"
#include "llsaleinfo.h"

2
indra/test/llsd_new_tut.cpp
View File

@ -30,7 +30,7 @@
* $/LicenseInfo$
*/
#include <tut/tut.h>
#include <tut/tut.hpp>
#include "linden_common.h"
#include "lltut.h"

2
indra/test/llsdmessagebuilder_tut.cpp
View File

@ -30,7 +30,7 @@
* $/LicenseInfo$
*/
#include <tut/tut.h>
#include <tut/tut.hpp>
#include "linden_common.h"
#include "lltut.h"

2
indra/test/llsdmessagereader_tut.cpp
View File

@ -30,7 +30,7 @@
* $/LicenseInfo$
*/
#include <tut/tut.h>
#include <tut/tut.hpp>
#include "linden_common.h"
#include "lltut.h"
#include "v3dmath.h"

2
indra/test/llservicebuilder_tut.cpp
View File

@ -30,7 +30,7 @@
* $/LicenseInfo$
*/
#include <tut/tut.h>
#include <tut/tut.hpp>
#include "linden_common.h"
#include "lltut.h"

2
indra/test/llstreamtools_tut.cpp
View File

@ -31,7 +31,7 @@
* $/LicenseInfo$
*/
#include <tut/tut.h>
#include <tut/tut.hpp>
#include "linden_common.h"
#include "llstreamtools.h"

2
indra/test/lltemplatemessagebuilder_tut.cpp
View File

@ -30,7 +30,7 @@
* $/LicenseInfo$
*/
#include <tut/tut.h>
#include <tut/tut.hpp>
#include "linden_common.h"
#include "lltut.h"

4
indra/test/lltut.cpp
View File

@ -39,7 +39,6 @@
namespace tut
{
template<>
void ensure_equals(const char* msg, const LLDate& actual,
const LLDate& expected)
{
@ -47,7 +46,6 @@ namespace tut
actual.secondsSinceEpoch(), expected.secondsSinceEpoch());
}
template<>
void ensure_equals(const char* msg, const LLURI& actual,
const LLURI& expected)
{
@ -55,7 +53,6 @@ namespace tut
actual.asString(), expected.asString());
}
template<>
void ensure_equals(const char* msg,
const std::vector<U8>& actual, const std::vector<U8>& expected)
{
@ -73,7 +70,6 @@ namespace tut
}
}
template<>
void ensure_equals(const char* m, const LLSD& actual,
const LLSD& expected)
{

6
indra/test/lltut.h
View File

@ -34,7 +34,7 @@
#ifndef LL_LLTUT_H
#define LL_LLTUT_H
#include <tut/tut.h>
#include <tut/tut.hpp>
#include "lldate.h"
#include "lluri.h"
@ -108,19 +108,15 @@ namespace tut
const Q& actual,const T& expected)
{ ensure_equals(msg.c_str(), actual, expected); }
template<>
void ensure_equals(const char* msg,
const LLDate& actual, const LLDate& expected);
template<>
void ensure_equals(const char* msg,
const LLURI& actual, const LLURI& expected);
template<>
void ensure_equals(const char* msg,
const std::vector<U8>& actual, const std::vector<U8>& expected);
template<>
void ensure_equals(const char* msg,
const LLSD& actual, const LLSD& expected);

2
indra/test/lluserrelations_tut.cpp
View File

@ -31,7 +31,7 @@
* $/LicenseInfo$
*/
#include <tut/tut.h>
#include <tut/tut.hpp>
#include "linden_common.h"
#include "lluserrelations.h"

2
indra/test/lluuidhashmap_tut.cpp
View File

@ -31,7 +31,7 @@
* $/LicenseInfo$
*/
#include <tut/tut.h>
#include <tut/tut.hpp>
#include "linden_common.h"
#include "lluuidhashmap.h"
#include "llsdserialize.h"

2
indra/test/message_tut.cpp
View File

@ -30,7 +30,7 @@
* $/LicenseInfo$
*/
#include <tut/tut.h>
#include <tut/tut.hpp>
#include "linden_common.h"
#include "lltut.h"

22
indra/test/test.cpp
View File

@ -68,7 +68,6 @@ public:
mPassedTests(0),
mFailedTests(0),
mSkippedTests(0),
mSkippedFailTests(0),
mStream(stream)
{
}
@ -107,10 +106,6 @@ public:
break;
case tut::test_result::skip:
++mSkippedTests;
out << "skipped";
break;
case tut::test_result::skip_fail:
++mSkippedFailTests;
out << "skipped known failure";
break;
default:
@ -159,12 +154,7 @@ private:
if (mSkippedTests > 0)
{
stream << "Skipped Tests: " << mSkippedTests << std::endl;
}
if (mSkippedFailTests > 0)
{
stream << "Skipped known failures: " << mSkippedFailTests
stream << "Skipped known failures: " << mSkippedTests
<< std::endl;
}
@ -183,7 +173,6 @@ protected:
int mPassedTests;
int mFailedTests;
int mSkippedTests;
int mSkippedFailTests;
std::ostream *mStream;
};
@ -194,7 +183,6 @@ static const apr_getopt_option_t TEST_CL_OPTIONS[] =
{"verbose", 'v', 0, "Verbose output."},
{"group", 'g', 1, "Run test group specified by option argument."},
{"output", 'o', 1, "Write output to the named file."},
{"skip", 's', 1, "Skip test number specified by option argument. Only works when a specific group is being tested"},
{"touch", 't', 1, "Touch the given file if all tests succeed"},
{"wait", 'w', 0, "Wait for input before exit."},
{"debug", 'd', 0, "Emit full debug logs."},
@ -226,8 +214,6 @@ void stream_usage(std::ostream& s, const char* app)
s << "\tList all available test groups." << std::endl;
s << " " << app << " --group=uuid" << std::endl;
s << "\tRun the test group 'uuid'." << std::endl;
s << " " << app << " --skip=2" << std::endl;
s << "\tSkip test case 2." << std::endl;
}
void stream_groups(std::ostream& s, const char* app)
@ -276,7 +262,6 @@ int main(int argc, char **argv)
// values used for controlling application
bool verbose_mode = false;
bool wait_at_exit = false;
int skip_test_id = 0;
std::string test_group;
// values use for options parsing
@ -302,9 +287,6 @@ int main(int argc, char **argv)
case 'g':
test_group.assign(opt_arg);
break;
case 's':
skip_test_id = atoi(opt_arg);
break;
case 'h':
stream_usage(std::cout, argv[0]);
return 0;
@ -347,7 +329,7 @@ int main(int argc, char **argv)
}
else
{
tut::runner.get().run_tests(test_group, skip_test_id);
tut::runner.get().run_tests(test_group);
}
if (wait_at_exit)

102
install.xml
View File

@ -1198,39 +1198,6 @@ anguage Infrstructure (CLI) international standard</string>
</map>
</map>
</map>
<key>openal</key>
<map>
<key>copyright</key>
<string>Copyright (C) 2008 by authors.</string>
<key>description</key>
<string>3D Audio library</string>
<key>license</key>
<string>lgpl</string>
<key>packages</key>
<map>
<key>darwin</key>
<map>
<key>md5sum</key>
<string>a0757244e3e6688fde2ffeea35cc1f96</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-darwin-20080924.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>f0d9a8d1318b519cffe6c40c9cac4e21</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-linux-20081010c-59a71b14-plughw.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>a0757244e3e6688fde2ffeea35cc1f96</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-windows-20080924.tar.bz2</uri>
</map>
</map>
</map>
<key>openSSL</key>
<map>
<key>license</key>
@ -1274,6 +1241,39 @@ anguage Infrstructure (CLI) international standard</string>
</map>
</map>
</map>
<key>openal</key>
<map>
<key>copyright</key>
<string>Copyright (C) 2008 by authors.</string>
<key>description</key>
<string>3D Audio library</string>
<key>license</key>
<string>lgpl</string>
<key>packages</key>
<map>
<key>darwin</key>
<map>
<key>md5sum</key>
<string>a0757244e3e6688fde2ffeea35cc1f96</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-darwin-20080924.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>f0d9a8d1318b519cffe6c40c9cac4e21</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-linux-20081010c-59a71b14-plughw.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>a0757244e3e6688fde2ffeea35cc1f96</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-windows-20080924.tar.bz2</uri>
</map>
</map>
</map>
<key>openjpeg</key>
<map>
<key>copyright</key>
@ -1383,47 +1383,19 @@ anguage Infrstructure (CLI) international standard</string>
<key>tut</key>
<map>
<key>copyright</key>
<string>Copyright 2002-2006 Vladimir Dyuzhev</string>
<string>Copyright 2002-2006 Vladimir Dyuzhev, Copyright 2007 Denis Kononenko, Copyright 2008 Michal Rzechonek</string>
<key>description</key>
<string>C++ Template Unit Test</string>
<key>license</key>
<string>bsd</string>
<key>packages</key>
<map>
<key>darwin</key>
<key>common</key>
<map>
<key>md5sum</key>
<string>1116d9ba0c34c042788421d4e520e747</string>
<string>a1b8a118ba9df1f2a73f6aafa7980e83</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/tut-darwin-20080613.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>1116d9ba0c34c042788421d4e520e747</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/tut-linux-20080812.tar.bz2</uri>
</map>
<key>linux32</key>
<map>
<key>md5sum</key>
<string>f410e4acdf4696c90d3fc708c41e6226</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/tut-2006-06-22-linux-i686-gcc-4.1-20080915.tar.bz2</uri>
</map>
<key>linux64</key>
<map>
<key>md5sum</key>
<string>728f4d8f74df8e84d0781b9ee9fc47ed</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/tut-2006-06-22-linux64-20080909.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>aa5e69f024bb408fac41d77d1101ccb6</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/tut-windows-20080613.tar.bz2</uri>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/tut-2008-11-30-common-20081208.tar.bz2</uri>
</map>
</map>
</map>