Recognize "buildbot" user in IsAutomaticTest() too.

Some build slaves apparently run under "buildbot" user and not "buildslave",
recognize them as running automatic tests too.

Also show the name of the current system and user on startup to avoid such
guess work in the future.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/test.cpp b/tests/test.cpp
index 6619dd21c529f03c6022798c4d663e9e135e9344..6b05835137472d923130d49f7300c513fbed0a0c 100644 (file)
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -423,7 +423,9 @@ extern bool IsAutomaticTest()
         if ( !wxGetEnv("WX_TEST_USER", &username) )
             username = wxGetUserId();
 
         if ( !wxGetEnv("WX_TEST_USER", &username) )
             username = wxGetUserId();
 

-        s_isAutomatic = username.Lower().Matches("buildslave*");
+        username.MakeLower();
+        s_isAutomatic = username.Matches("buildslave*") ||
+                            username.Matches("buildbot*");

     }
 
     return s_isAutomatic == 1;
     }
 
     return s_isAutomatic == 1;


@@ -477,7 +479,9 @@ bool TestApp::OnInit()
 #else
     cout << "Test program for wxWidgets non-GUI features\n"
 #endif
 #else
     cout << "Test program for wxWidgets non-GUI features\n"
 #endif

-         << "build: " << WX_BUILD_OPTIONS_SIGNATURE << std::endl;
+         << "build: " << WX_BUILD_OPTIONS_SIGNATURE << "\n"
+         << "running under " << wxGetOsDescription()
+         << " as " << wxGetUserId() << std::endl;

 
     if ( m_detail )
     {
 
     if ( m_detail )
     {