fixes potential crash under gatekeeper

[wxWidgets.git] / tests / test.cpp

diff --git a/tests/test.cpp b/tests/test.cpp
index c3bbc3119155f7e37c0226aced6e8e853a36a7d5..cdb57c535ad55c5278c513bbc71d3ef7ff406594 100644 (file)
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -165,7 +165,7 @@ static string GetExceptionMessage()
         throw;
     }
 #if wxDEBUG_LEVEL
         throw;
     }
 #if wxDEBUG_LEVEL

-    catch ( TestAssertFailure& e )
+    catch ( TestAssertFailure& )

     {
         msg = s_lastAssertMessage;
         s_lastAssertMessage.clear();
     {
         msg = s_lastAssertMessage;
         s_lastAssertMessage.clear();


@@ -412,6 +412,25 @@ extern bool IsNetworkAvailable()
     return online;
 }
 
     return online;
 }
 

+extern bool IsAutomaticTest()
+{
+    static int s_isAutomatic = -1;
+    if ( s_isAutomatic == -1 )
+    {
+        // Allow setting an environment variable to emulate buildslave user for
+        // testing.
+        wxString username;
+        if ( !wxGetEnv("WX_TEST_USER", &username) )
+            username = wxGetUserId();
+
+        username.MakeLower();
+        s_isAutomatic = username.Matches("buildslave*") ||
+                            username.Matches("sandbox*");
+    }
+
+    return s_isAutomatic == 1;
+}
+

 // helper of OnRun(): gets the test with the given name, returning NULL (and
 // not an empty test suite) if there is no such test
 static Test *GetTestByName(const wxString& name)
 // helper of OnRun(): gets the test with the given name, returning NULL (and
 // not an empty test suite) if there is no such test
 static Test *GetTestByName(const wxString& name)


@@ -460,7 +479,16 @@ 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 )
+    {
+        // Output some important information about the test environment.
+        cout << "Running under " << wxGetOsDescription() << ", "
+                "locale is " << setlocale(LC_ALL, NULL) << std::endl;
+    }

 
 #if wxUSE_GUI
     // create a hidden parent window to be used as parent for the GUI controls
 
 #if wxUSE_GUI
     // create a hidden parent window to be used as parent for the GUI controls