applying editor part of patch, see #15003

[wxWidgets.git] / tests / validators / valnum.cpp

diff --git a/tests/validators/valnum.cpp b/tests/validators/valnum.cpp
index 91675d0c9e8940d4e21204eda5316a8d058b4bb9..599192e835ab332c8557f8ddb3d8c33729e733cc 100644 (file)
--- a/tests/validators/valnum.cpp
+++ b/tests/validators/valnum.cpp
@@ -61,7 +61,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( NumValidatorTestCase );
 
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( NumValidatorTestCase );
 

-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone

 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( NumValidatorTestCase, "NumValidatorTestCase" );
 
 void NumValidatorTestCase::setUp()
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( NumValidatorTestCase, "NumValidatorTestCase" );
 
 void NumValidatorTestCase::setUp()


@@ -204,11 +204,13 @@ void NumValidatorTestCase::NoTrailingZeroes()
 
 void NumValidatorTestCase::Interactive()
 {
 
 void NumValidatorTestCase::Interactive()
 {

+#ifdef __WXMSW__

     // FIXME: This test fails on MSW buildbot slaves although works fine on
     //        development machine, no idea why. It seems to be a problem with
     //        wxUIActionSimulator rather the wxListCtrl control itself however.
     // FIXME: This test fails on MSW buildbot slaves although works fine on
     //        development machine, no idea why. It seems to be a problem with
     //        wxUIActionSimulator rather the wxListCtrl control itself however.

-    if ( wxGetUserId().Lower().Matches("buildslave*") )
+    if ( IsAutomaticTest() )

         return;
         return;

+#endif // __WXMSW__

 
     // Set a locale using comma as thousands separator character.
     wxLocale loc(wxLANGUAGE_ENGLISH_UK, wxLOCALE_DONT_LOAD_DEFAULT);
 
     // Set a locale using comma as thousands separator character.
     wxLocale loc(wxLANGUAGE_ENGLISH_UK, wxLOCALE_DONT_LOAD_DEFAULT);