fixes potential crash under gatekeeper

[wxWidgets.git] / tests / test.cpp

diff --git a/tests/test.cpp b/tests/test.cpp
index e7eeffcfa58a977869858635a749e132866c2023..cdb57c535ad55c5278c513bbc71d3ef7ff406594 100644 (file)
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -165,7 +165,7 @@ static string GetExceptionMessage()
         throw;
     }
 #if wxDEBUG_LEVEL
-    catch ( TestAssertFailure& e )
+    catch ( TestAssertFailure& )
     {
         msg = s_lastAssertMessage;
         s_lastAssertMessage.clear();
@@ -231,7 +231,7 @@ public:
 
     virtual void startTest(CppUnit::Test *test)
     {
-        wxPrintf("  %-60s  ", test->getName());
+        printf("  %-60s  ", test->getName().c_str());
         m_result = RESULT_OK;
         m_watch.Start();
     }
@@ -244,10 +244,10 @@ public:
     virtual void endTest(CppUnit::Test * WXUNUSED(test))
     {
         m_watch.Pause();
-        wxPrintf(GetResultStr(m_result));
+        printf("%s", GetResultStr(m_result));
         if (m_timing)
-            wxPrintf("  %6ld ms", m_watch.Time());
-        wxPrintf("\n");
+            printf("  %6ld ms", m_watch.Time());
+        printf("\n");
     }
 
 protected :
@@ -259,7 +259,7 @@ protected :
         RESULT_MAX
     };
 
-    wxString GetResultStr(ResultType type) const
+    const char* GetResultStr(ResultType type) const
     {
         static const char *resultTypeNames[] =
         {
@@ -412,6 +412,25 @@ extern bool IsNetworkAvailable()
     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)
@@ -460,7 +479,16 @@ 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 )
+    {
+        // 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