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

make sure that wxProcess always have a valid PID set; add test unit for wxExecute,wxShell,wxProcess based on the code in the console sample; add some more infos/notes in wxProcess docs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-03-23 16:23:44 +00:00
parent 20ede3925f
commit ca5016d4dd
25 changed files with 4797 additions and 4631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
samples/console/console.cpp
View File

@@ -110,7 +110,6 @@
#define TEST_DIR
#define TEST_DYNLIB
#define TEST_ENVIRON
#define TEST_EXECUTE
#define TEST_FILE
#define TEST_FILECONF
#define TEST_FILENAME
@@ -575,93 +574,6 @@ static void TestEnvironment()
#endif // TEST_ENVIRON
// ----------------------------------------------------------------------------
// wxExecute
// ----------------------------------------------------------------------------
#ifdef TEST_EXECUTE
#include "wx/utils.h"
static void TestExecute()
{
wxPuts(_T("*** testing wxExecute ***"));
#ifdef __UNIX__
#define COMMAND "echo hi"
#define ASYNC_COMMAND "xclock"
#define SHELL_COMMAND "echo hi from shell"
#define REDIRECT_COMMAND "cat -n Makefile"
#elif defined(__WXMSW__)
#define COMMAND "command.com /c echo hi"
#define ASYNC_COMMAND "notepad"
#define SHELL_COMMAND "echo hi"
#define REDIRECT_COMMAND COMMAND
#else
#error "no command to exec"
#endif // OS
wxPrintf(_T("Testing wxShell: "));
fflush(stdout);
if ( wxShell(_T(SHELL_COMMAND)) )
wxPuts(_T("Ok."));
else
wxPuts(_T("ERROR."));
wxPrintf(_T("Testing wxExecute: "));
fflush(stdout);
if ( wxExecute(_T(COMMAND), wxEXEC_SYNC) == 0 )
wxPuts(_T("Ok."));
else
wxPuts(_T("ERROR."));
wxPrintf(_T("Testing async wxExecute: "));
fflush(stdout);
int pid = wxExecute(ASYNC_COMMAND);
if ( pid != 0 )
{
wxPuts(_T("Ok (command launched)."));
if ( wxKill(pid) == -1 )
wxPuts("ERROR: failed to kill child process.");
}
else
wxPuts(_T("ERROR."));
wxPrintf(_T("Testing wxExecute with redirection:\n"));
wxArrayString output;
if ( wxExecute(_T(REDIRECT_COMMAND), output) != 0 )
{
wxPuts(_T("ERROR."));
}
else
{
// don't show too much output, MAX_LINES is enough
static const unsigned MAX_LINES = 20;
const unsigned count = output.size();
for ( unsigned n = 0;
n < (count > MAX_LINES ? MAX_LINES/2 : count);
n++ )
{
wxPrintf("%04u:\t%s\n", n + 1, output[n]);
}
if ( count > MAX_LINES )
{
wxPrintf("... skipping %u lines...\n", count - MAX_LINES);
for ( unsigned n = count - MAX_LINES/2; n < count; n++ )
{
wxPrintf("%04u:\t%s\n", n + 1, output[n]);
}
}
wxPuts(_T("Ok."));
}
}
#endif // TEST_EXECUTE
// ----------------------------------------------------------------------------
// file
// ----------------------------------------------------------------------------
@@ -4340,10 +4252,6 @@ int main(int argc, char **argv)
TestEnvironment();
#endif // TEST_ENVIRON
#ifdef TEST_EXECUTE
TestExecute();
#endif // TEST_EXECUTE
#ifdef TEST_FILECONF
TestFileConfRead();
#endif // TEST_FILECONF