Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uncomment wxExecute(ASYNC) test now that it's supposed to work

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-03-21 23:48:29 +00:00
parent 6ed05f194d
commit 331abcf7d7
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
samples/console/console.cpp
View File

@@ -88,7 +88,7 @@
#define TEST_WCHAR #define TEST_WCHAR
#define TEST_ZIP #define TEST_ZIP
#else // #if TEST_ALL #else // #if TEST_ALL
#define TEST_CMDLINE #define TEST_EXECUTE
#endif #endif
// some tests are interactive, define this to run them // some tests are interactive, define this to run them
@@ -536,11 +536,13 @@ static void TestExecute()
wxPuts(_T("*** testing wxExecute ***")); wxPuts(_T("*** testing wxExecute ***"));
#ifdef __UNIX__ #ifdef __UNIX__
#define COMMAND "cat -n ../../Makefile" // "echo hi" #define COMMAND "echo hi"
#define ASYNC_COMMAND "xclock"
#define SHELL_COMMAND "echo hi from shell" #define SHELL_COMMAND "echo hi from shell"
#define REDIRECT_COMMAND COMMAND // "date" #define REDIRECT_COMMAND COMMAND "cat -n Makefile"
#elif defined(__WXMSW__) #elif defined(__WXMSW__)
#define COMMAND "command.com /c echo hi" #define COMMAND "command.com /c echo hi"
#define ASYNC_COMMAND "notepad"
#define SHELL_COMMAND "echo hi" #define SHELL_COMMAND "echo hi"
#define REDIRECT_COMMAND COMMAND #define REDIRECT_COMMAND COMMAND
#else #else
@@ -556,19 +558,17 @@ static void TestExecute()
wxPrintf(_T("Testing wxExecute: ")); wxPrintf(_T("Testing wxExecute: "));
fflush(stdout); fflush(stdout);
if ( wxExecute(_T(COMMAND), true /* sync */) == 0 ) if ( wxExecute(_T(COMMAND), wxEXEC_SYNC) == 0 )
wxPuts(_T("Ok.")); wxPuts(_T("Ok."));
else else
wxPuts(_T("ERROR.")); wxPuts(_T("ERROR."));
#if 0 // no, it doesn't work (yet?)
wxPrintf(_T("Testing async wxExecute: ")); wxPrintf(_T("Testing async wxExecute: "));
fflush(stdout); fflush(stdout);
if ( wxExecute(COMMAND) != 0 ) if ( wxExecute(ASYNC_COMMAND) != 0 )
wxPuts(_T("Ok (command launched).")); wxPuts(_T("Ok (command launched)."));
else else
wxPuts(_T("ERROR.")); wxPuts(_T("ERROR."));
#endif // 0
wxPrintf(_T("Testing wxExecute with redirection:\n")); wxPrintf(_T("Testing wxExecute with redirection:\n"));
wxArrayString output; wxArrayString output;
@@ -578,10 +578,10 @@ static void TestExecute()
} }
else else
{ {
size_t count = output.GetCount(); unsigned count = output.GetCount();
for ( size_t n = 0; n < count; n++ ) for ( unsigned n = 0; n < count; n++ )
{ {
wxPrintf(_T("\t%s\n"), output[n].c_str()); wxPrintf("%04u:\t%s\n", n, output[n]);
} }
wxPuts(_T("Ok.")); wxPuts(_T("Ok."));