From 92d184847a15298bb8cd54a37ba59243925b54c1 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Sat, 29 Jun 2013 10:10:51 -0400 Subject: MAINT-2302: Re-enable previously-disabled LLProcess tests for diagnosis. --- indra/llcommon/tests/llprocess_test.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp index f188865eb0..1af8b223ed 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"); @@ -623,9 +620,6 @@ 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 @@ -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); { -- cgit v1.2.3 From c5c412469a4d7626a6fec268e74826661e539361 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Sat, 29 Jun 2013 10:12:30 -0400 Subject: MAINT-2302: Make llprocess test<6> output less like a build error. build.sh LogScan greps for "error:" (among other things) so removing the colon from the test name "syntax_error" should help. --- indra/llcommon/tests/llprocess_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp index 1af8b223ed..3e68ef068e 100755 --- a/indra/llcommon/tests/llprocess_test.cpp +++ b/indra/llcommon/tests/llprocess_test.cpp @@ -619,7 +619,7 @@ namespace tut template<> template<> void object::test<6>() { - set_test_name("syntax_error:"); + set_test_name("syntax_error"); PythonProcessLauncher py(get_test_name(), "syntax_error:\n"); py.mParams.files.add(LLProcess::FileParam()); // inherit stdin -- cgit v1.2.3 From 739327bb022fb97b3666070210bb14cfe4c0660d Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 19 Aug 2013 14:50:38 -0400 Subject: Added tag 3.6.3-release for changeset fe4f7c5e9fd2 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 00dbda157d..c892fcb28e 100755 --- a/.hgtags +++ b/.hgtags @@ -465,3 +465,4 @@ fb1630153bac5552046ea914af3f14deabc1def8 3.6.0-materials-beta1 0a56f33ad6aa112032b14a41dad759ad377bdde9 3.6.0-release 75cf8e855ae1af6895a35da475314c2b5acf1850 3.6.1-release f6741d5fe8d632651424484df0fe0cb4a01e9fbe 3.6.2-release +fe4f7c5e9fd27e09d03deb1cc9ab3e5093f6309e 3.6.3-release -- cgit v1.2.3 From 171089207b528ab80a954292c127ba77254ee927 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 19 Aug 2013 14:51:04 -0400 Subject: increment viewer version to 3.6.4 --- indra/newview/VIEWER_VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index 4a788a01da..0f44168a4d 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -3.6.3 +3.6.4 -- cgit v1.2.3