diff options
| author | simon <none@none> | 2013-08-21 13:59:10 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-08-21 13:59:10 -0700 |
| commit | 33a4d333e96e8c1c501f1afeced1d5e088cb8b1e (patch) | |
| tree | 548a5fc84f34dfb514b6134fbe078c1ffaff2d9f /indra/llcommon/tests/llprocess_test.cpp | |
| parent | ce6d63be47a7588b7b8ff53bf38d73eabc4ab04b (diff) | |
| parent | 2b634d6c45d61f7132fc124e559347a736c6dfda (diff) | |
Merge downstream code, including viewer-release
Diffstat (limited to 'indra/llcommon/tests/llprocess_test.cpp')
| -rwxr-xr-x | indra/llcommon/tests/llprocess_test.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp index f188865eb0..3e68ef068e 100755 --- a/indra/llcommon/tests/llprocess_test.cpp +++ b/indra/llcommon/tests/llprocess_test.cpp @@ -608,9 +608,6 @@ 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"); @@ -622,10 +619,7 @@ namespace tut template<> template<> void object::test<6>() { - set_test_name("syntax_error:"); -#if LL_WINDOWS - skip("MAINT-2302: This frequently (though not always) fails on Windows."); -#endif + set_test_name("syntax_error"); PythonProcessLauncher py(get_test_name(), "syntax_error:\n"); py.mParams.files.add(LLProcess::FileParam()); // inherit stdin @@ -647,9 +641,6 @@ 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" @@ -694,9 +685,6 @@ 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); { |