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
This commit is contained in:
parent
862c0963cb
commit
6524d302d0
@ -423,7 +423,9 @@ extern bool IsAutomaticTest()
|
||||
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;
|
||||
@ -477,7 +479,9 @@ bool TestApp::OnInit()
|
||||
#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 )
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user