From 54c874d488ee095d897ec1a079b830d7a21f8cfa Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 13 Feb 2016 18:34:47 +0100
Subject: [PATCH] Don't duplicate information in detailed test output

No need to output wxGetOsDescription() twice.
---
 tests/test.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/test.cpp b/tests/test.cpp
index ca92abb885..55f741af62 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -541,6 +541,7 @@ bool TestApp::OnInit()
     if ( !TestAppBase::OnInit() )
         return false;
 
+    // Output some important information about the test environment.
 #if wxUSE_GUI
     cout << "Test program for wxWidgets GUI features\n"
 #else
@@ -548,15 +549,15 @@ bool TestApp::OnInit()
 #endif
          << "build: " << WX_BUILD_OPTIONS_SIGNATURE << "\n"
          << "running under " << wxGetOsDescription()
-         << " as " << wxGetUserId() << std::endl;
+         << " as " << wxGetUserId();
 
     if ( m_detail )
     {
-        // Output some important information about the test environment.
-        cout << "Running under " << wxGetOsDescription() << ", "
-                "locale is " << setlocale(LC_ALL, NULL) << std::endl;
+        cout << ", locale is " << setlocale(LC_ALL, NULL);
     }
 
+    cout << std::endl;
+
 #if wxUSE_GUI
     // create a hidden parent window to be used as parent for the GUI controls
     wxTestableFrame* frame = new wxTestableFrame();