diff options
Diffstat (limited to 'indra/llcommon/tests/llprocess_test.cpp')
| -rw-r--r-- | indra/llcommon/tests/llprocess_test.cpp | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp index 999d432079..54a1c55a2d 100644 --- a/indra/llcommon/tests/llprocess_test.cpp +++ b/indra/llcommon/tests/llprocess_test.cpp @@ -361,10 +361,17 @@ namespace tut "import time" EOL EOL "time.sleep(2)" EOL +<<<<<<< HEAD "print('stdout after wait',file=sys.stdout)" EOL "sys.stdout.flush()" EOL "time.sleep(2)" EOL "print('stderr after wait',file=sys.stderr)" EOL +======= + "print('stdout after wait', file=sys.stdout)" EOL + "sys.stdout.flush()" EOL + "time.sleep(2)" EOL + "print('stderr after wait', file=sys.stderr)" EOL +>>>>>>> 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 "sys.stderr.flush()" EOL ); @@ -862,7 +869,10 @@ namespace tut set_test_name("'bogus' test"); CaptureLog recorder; PythonProcessLauncher py(get_test_name(), +<<<<<<< HEAD "from __future__ import print_function\n" +======= +>>>>>>> 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 "print('Hello world')\n"); py.mParams.files.add(LLProcess::FileParam("bogus")); py.mPy = LLProcess::create(py.mParams); @@ -878,7 +888,10 @@ namespace tut // Replace this test with one or more real 'file' tests when we // implement 'file' support PythonProcessLauncher py(get_test_name(), +<<<<<<< HEAD "from __future__ import print_function\n" +======= +>>>>>>> 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 "print('Hello world')\n"); py.mParams.files.add(LLProcess::FileParam()); py.mParams.files.add(LLProcess::FileParam("file")); @@ -894,7 +907,10 @@ namespace tut // implement 'tpipe' support CaptureLog recorder; PythonProcessLauncher py(get_test_name(), +<<<<<<< HEAD "from __future__ import print_function\n" +======= +>>>>>>> 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 "print('Hello world')\n"); py.mParams.files.add(LLProcess::FileParam()); py.mParams.files.add(LLProcess::FileParam("tpipe")); @@ -912,7 +928,10 @@ namespace tut // implement 'npipe' support CaptureLog recorder; PythonProcessLauncher py(get_test_name(), +<<<<<<< HEAD "from __future__ import print_function\n" +======= +>>>>>>> 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 "print('Hello world')\n"); py.mParams.files.add(LLProcess::FileParam()); py.mParams.files.add(LLProcess::FileParam()); @@ -989,8 +1008,12 @@ namespace tut { set_test_name("get*Pipe() validation"); PythonProcessLauncher py(get_test_name(), +<<<<<<< HEAD "from __future__ import print_function\n" "print('this output is expected')\n"); +======= + "print('this output is expected)'\n"); +>>>>>>> 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 py.mParams.files.add(LLProcess::FileParam("pipe")); // pipe for stdin py.mParams.files.add(LLProcess::FileParam()); // inherit stdout py.mParams.files.add(LLProcess::FileParam("pipe")); // pipe for stderr @@ -1129,7 +1152,10 @@ namespace tut { set_test_name("ReadPipe \"eof\" event"); PythonProcessLauncher py(get_test_name(), +<<<<<<< HEAD "from __future__ import print_function\n" +======= +>>>>>>> 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 "print('Hello from Python!')\n"); py.mParams.files.add(LLProcess::FileParam()); // stdin py.mParams.files.add(LLProcess::FileParam("pipe")); // stdout |