diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-01-17 03:58:24 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-01-17 03:58:24 +0200 |
| commit | 15c62d9e713eb1d51cc063c4ec2fed1d1f4ca59c (patch) | |
| tree | bbd0338a45d6fe58923f108399eaa6db91568420 /indra/newview/tests/llversioninfo_test.cpp | |
| parent | 4e808cfa852b873b484d0b9c90ab89ac196c3e52 (diff) | |
| parent | 57a99273ed023bd71c54399969e66ffc23eebc57 (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/newview/tests/llversioninfo_test.cpp')
| -rw-r--r-- | indra/newview/tests/llversioninfo_test.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/indra/newview/tests/llversioninfo_test.cpp b/indra/newview/tests/llversioninfo_test.cpp index 6b0be29c2d..2f7a4e9601 100644 --- a/indra/newview/tests/llversioninfo_test.cpp +++ b/indra/newview/tests/llversioninfo_test.cpp @@ -29,6 +29,15 @@ #include "../llversioninfo.h" + #include <iostream> + +// LL_VIEWER_CHANNEL is a macro defined on the compiler command line. The +// macro expands to the string name of the channel, but without quotes. We +// need to turn it into a quoted string. This macro trick does that. +#define stringize_inner(x) #x +#define stringize_outer(x) stringize_inner(x) +#define ll_viewer_channel stringize_outer(LL_VIEWER_CHANNEL) + namespace tut { struct versioninfo @@ -50,7 +59,7 @@ namespace tut mShortVersion = stream.str(); stream.str(""); - stream << LL_VIEWER_CHANNEL + stream << ll_viewer_channel << " " << mVersion; mVersionAndChannel = stream.str(); @@ -74,7 +83,9 @@ namespace tut template<> template<> void versioninfo_object_t::test<1>() - { + { + std::cout << "What we parsed from CMake: " << LL_VIEWER_VERSION_BUILD << std::endl; + std::cout << "What we get from llversioninfo: " << LLVersionInfo::getBuild() << std::endl; ensure_equals("Major version", LLVersionInfo::getMajor(), LL_VIEWER_VERSION_MAJOR); @@ -89,7 +100,7 @@ namespace tut LL_VIEWER_VERSION_BUILD); ensure_equals("Channel version", LLVersionInfo::getChannel(), - LL_VIEWER_CHANNEL); + ll_viewer_channel); ensure_equals("Version String", LLVersionInfo::getVersion(), mVersion); |