From: Vadim Zeitlin Date: Sat, 6 Jul 2013 00:27:50 +0000 (+0000) Subject: Fix test for Windows in the new wxExecute() unit test. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/431b8364e61bb3dae2640aa8b87d2226812fab5e?ds=inline Fix test for Windows in the new wxExecute() unit test. TestOverlappedSyncExecute() doesn't currently pass under Windows and was supposed to not be executed there but was, in console test, as __WXMSW__ is not defined in this case, only __WINDOWS__ is (as there is no GUI toolkit in the console applications). See #10258. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/tests/exec/exec.cpp b/tests/exec/exec.cpp index d493f39bb6..f67f30eff5 100644 --- a/tests/exec/exec.cpp +++ b/tests/exec/exec.cpp @@ -436,7 +436,7 @@ void ExecTestCase::TestOverlappedSyncExecute() // // Too bad you can't just register one test case of a test suite as a // "fixme". -#ifndef __WXMSW__ +#ifndef __WINDOWS__ // Simple helper delaying the call to wxExecute(): instead of running it // immediately, it runs it when we re-enter the event loop. class DelayedExecuteTimer : public wxTimer @@ -495,5 +495,5 @@ void ExecTestCase::TestOverlappedSyncExecute() CPPUNIT_ASSERT( !longSleepOutput.empty() ); CPPUNIT_ASSERT_EQUAL( SLEEP_END_STRING, longSleepOutput.Last() ); -#endif // !__WXMSW__ +#endif // !__WINDOWS__ }