diff options
author | dolphin <dolphin@lindenlab.com> | 2013-05-20 10:08:27 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-05-20 10:08:27 -0700 |
commit | 716a963d5544977863d07770c3c6449b3d9897bb (patch) | |
tree | 36ce3c4707851bb04f557d790fe410d26a009293 /indra/llcommon/tests/llprocess_test.cpp | |
parent | 6308f93c6adddc9d396e8d2527e97e0d02c4aa52 (diff) | |
parent | 0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff) |
Merge with viewer-release
Diffstat (limited to 'indra/llcommon/tests/llprocess_test.cpp')
-rwxr-xr-x[-rw-r--r--] | indra/llcommon/tests/llprocess_test.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp index 99186ed434..6f1e7d46b8 100644..100755 --- a/indra/llcommon/tests/llprocess_test.cpp +++ b/indra/llcommon/tests/llprocess_test.cpp @@ -608,6 +608,9 @@ namespace tut void object::test<5>() { set_test_name("exit(2)"); +#if LL_WINDOWS + skip("MAINT-2302: This frequently (though not always) fails on Windows."); +#endif PythonProcessLauncher py(get_test_name(), "import sys\n" "sys.exit(2)\n"); @@ -620,6 +623,9 @@ namespace tut void object::test<6>() { set_test_name("syntax_error:"); +#if LL_WINDOWS + skip("MAINT-2302: This frequently (though not always) fails on Windows."); +#endif PythonProcessLauncher py(get_test_name(), "syntax_error:\n"); py.mParams.files.add(LLProcess::FileParam()); // inherit stdin @@ -641,6 +647,9 @@ namespace tut void object::test<7>() { set_test_name("explicit kill()"); +#if LL_WINDOWS + skip("MAINT-2302: This frequently (though not always) fails on Windows."); +#endif PythonProcessLauncher py(get_test_name(), "from __future__ import with_statement\n" "import sys, time\n" @@ -685,6 +694,9 @@ namespace tut void object::test<8>() { set_test_name("implicit kill()"); +#if LL_WINDOWS + skip("MAINT-2302: This frequently (though not always) fails on Windows."); +#endif NamedTempFile out("out", "not started"); LLProcess::handle phandle(0); { |