diff options
author | mberezhnoy <mberezhnoy@productengine.com> | 2013-08-21 18:56:11 +0300 |
---|---|---|
committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-08-21 18:56:11 +0300 |
commit | 15e59b81b0f1117384d2400619f3460dafbb7a3f (patch) | |
tree | 33e2c5f8635465a2046838e9abeeacb0fa5bd193 /indra/llcommon/tests | |
parent | 10419d802f88e7636a6ca45c6025b7e19b3ca3c7 (diff) | |
parent | 82bf4e4db2bdb9effdf64e9edaa76a78913e25d3 (diff) |
merge
Diffstat (limited to 'indra/llcommon/tests')
-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); { |