diff options
| author | Callum Prentice <callum@gmail.com> | 2017-07-12 10:56:23 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-07-12 10:56:23 -0700 |
| commit | c6c7c7c71da48b60557dbc4b653398dd6343b6fc (patch) | |
| tree | 6711858f93cb0353d44568c4531ba8392990cea2 /indra/newview/tests/llversioninfo_test.cpp | |
| parent | 07185d300d7879fc4d8d268210fa2c440efe02f4 (diff) | |
| parent | 83cda57b10e1416f2d104941f862f598653c42cb (diff) | |
Automated merge with tip of viewer64
Diffstat (limited to 'indra/newview/tests/llversioninfo_test.cpp')
| -rw-r--r-- | indra/newview/tests/llversioninfo_test.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/tests/llversioninfo_test.cpp b/indra/newview/tests/llversioninfo_test.cpp index f1f69f33f1..2f7a4e9601 100644 --- a/indra/newview/tests/llversioninfo_test.cpp +++ b/indra/newview/tests/llversioninfo_test.cpp @@ -29,6 +29,8 @@ #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. @@ -81,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); |