Fix line endings. WHAMMY.

18 files changed, 3304 insertions, 3304 deletions

diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-param-test_test.h b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-param-test_test.h
index 7804aa91..b7f94936 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-param-test_test.h
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-param-test_test.h
@@ -1,55 +1,55 @@
-// Copyright 2008, Google Inc.

-// All rights reserved.

-//

-// Redistribution and use in source and binary forms, with or without

-// modification, are permitted provided that the following conditions are

-// met:

-//

-//     * Redistributions of source code must retain the above copyright

-// notice, this list of conditions and the following disclaimer.

-//     * Redistributions in binary form must reproduce the above

-// copyright notice, this list of conditions and the following disclaimer

-// in the documentation and/or other materials provided with the

-// distribution.

-//     * Neither the name of Google Inc. nor the names of its

-// contributors may be used to endorse or promote products derived from

-// this software without specific prior written permission.

-//

-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-//

-// Authors: [email protected] (Vlad Losev)

-//

-// The Google C++ Testing Framework (Google Test)

-//

-// This header file provides classes and functions used internally

-// for testing Google Test itself.

-

-#ifndef GTEST_TEST_GTEST_PARAM_TEST_TEST_H_

-#define GTEST_TEST_GTEST_PARAM_TEST_TEST_H_

-

-#include <gtest/gtest.h>

-

-#if GTEST_HAS_PARAM_TEST

-

-// Test fixture for testing definition and instantiation of a test

-// in separate translation units.

-class ExternalInstantiationTest : public ::testing::TestWithParam<int> {};

-

-// Test fixture for testing instantiation of a test in multiple

-// translation units.

-class InstantiationInMultipleTranslaionUnitsTest

-    : public ::testing::TestWithParam<int> {};

-

-#endif  // GTEST_HAS_PARAM_TEST

-

-#endif  // GTEST_TEST_GTEST_PARAM_TEST_TEST_H_

+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Authors: [email protected] (Vlad Losev)
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This header file provides classes and functions used internally
+// for testing Google Test itself.
+
+#ifndef GTEST_TEST_GTEST_PARAM_TEST_TEST_H_
+#define GTEST_TEST_GTEST_PARAM_TEST_TEST_H_
+
+#include <gtest/gtest.h>
+
+#if GTEST_HAS_PARAM_TEST
+
+// Test fixture for testing definition and instantiation of a test
+// in separate translation units.
+class ExternalInstantiationTest : public ::testing::TestWithParam<int> {};
+
+// Test fixture for testing instantiation of a test in multiple
+// translation units.
+class InstantiationInMultipleTranslaionUnitsTest
+    : public ::testing::TestWithParam<int> {};
+
+#endif  // GTEST_HAS_PARAM_TEST
+
+#endif  // GTEST_TEST_GTEST_PARAM_TEST_TEST_H_
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-typed-test_test.h b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-typed-test_test.h
index 283d36b0..40dfeac6 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-typed-test_test.h
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-typed-test_test.h
@@ -1,66 +1,66 @@
-// Copyright 2008 Google Inc.

-// All Rights Reserved.

-//

-// Redistribution and use in source and binary forms, with or without

-// modification, are permitted provided that the following conditions are

-// met:

-//

-//     * Redistributions of source code must retain the above copyright

-// notice, this list of conditions and the following disclaimer.

-//     * Redistributions in binary form must reproduce the above

-// copyright notice, this list of conditions and the following disclaimer

-// in the documentation and/or other materials provided with the

-// distribution.

-//     * Neither the name of Google Inc. nor the names of its

-// contributors may be used to endorse or promote products derived from

-// this software without specific prior written permission.

-//

-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-//

-// Author: [email protected] (Zhanyong Wan)

-

-#ifndef GTEST_TEST_GTEST_TYPED_TEST_TEST_H_

-#define GTEST_TEST_GTEST_TYPED_TEST_TEST_H_

-

-#include <gtest/gtest.h>

-

-#if GTEST_HAS_TYPED_TEST_P

-

-using testing::Test;

-

-// For testing that the same type-parameterized test case can be

-// instantiated in different translation units linked together.

-// ContainerTest will be instantiated in both gtest-typed-test_test.cc

-// and gtest-typed-test2_test.cc.

-

-template <typename T>

-class ContainerTest : public Test {

-};

-

-TYPED_TEST_CASE_P(ContainerTest);

-

-TYPED_TEST_P(ContainerTest, CanBeDefaultConstructed) {

-  TypeParam container;

-}

-

-TYPED_TEST_P(ContainerTest, InitialSizeIsZero) {

-  TypeParam container;

-  EXPECT_EQ(0U, container.size());

-}

-

-REGISTER_TYPED_TEST_CASE_P(ContainerTest,

-                           CanBeDefaultConstructed, InitialSizeIsZero);

-

-#endif  // GTEST_HAS_TYPED_TEST_P

-

-#endif  // GTEST_TEST_GTEST_TYPED_TEST_TEST_H_

+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: [email protected] (Zhanyong Wan)
+
+#ifndef GTEST_TEST_GTEST_TYPED_TEST_TEST_H_
+#define GTEST_TEST_GTEST_TYPED_TEST_TEST_H_
+
+#include <gtest/gtest.h>
+
+#if GTEST_HAS_TYPED_TEST_P
+
+using testing::Test;
+
+// For testing that the same type-parameterized test case can be
+// instantiated in different translation units linked together.
+// ContainerTest will be instantiated in both gtest-typed-test_test.cc
+// and gtest-typed-test2_test.cc.
+
+template <typename T>
+class ContainerTest : public Test {
+};
+
+TYPED_TEST_CASE_P(ContainerTest);
+
+TYPED_TEST_P(ContainerTest, CanBeDefaultConstructed) {
+  TypeParam container;
+}
+
+TYPED_TEST_P(ContainerTest, InitialSizeIsZero) {
+  TypeParam container;
+  EXPECT_EQ(0U, container.size());
+}
+
+REGISTER_TYPED_TEST_CASE_P(ContainerTest,
+                           CanBeDefaultConstructed, InitialSizeIsZero);
+
+#endif  // GTEST_HAS_TYPED_TEST_P
+
+#endif  // GTEST_TEST_GTEST_TYPED_TEST_TEST_H_
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_break_on_failure_unittest.py b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_break_on_failure_unittest.py
index 4d41fcd7..218d3713 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_break_on_failure_unittest.py
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_break_on_failure_unittest.py
@@ -1,215 +1,215 @@
-#!/usr/bin/env python

-#

-# Copyright 2006, Google Inc.

-# All rights reserved.

-#

-# Redistribution and use in source and binary forms, with or without

-# modification, are permitted provided that the following conditions are

-# met:

-#

-#     * Redistributions of source code must retain the above copyright

-# notice, this list of conditions and the following disclaimer.

-#     * Redistributions in binary form must reproduce the above

-# copyright notice, this list of conditions and the following disclaimer

-# in the documentation and/or other materials provided with the

-# distribution.

-#     * Neither the name of Google Inc. nor the names of its

-# contributors may be used to endorse or promote products derived from

-# this software without specific prior written permission.

-#

-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-"""Unit test for Google Test's break-on-failure mode.

-

-A user can ask Google Test to seg-fault when an assertion fails, using

-either the GTEST_BREAK_ON_FAILURE environment variable or the

---gtest_break_on_failure flag.  This script tests such functionality

-by invoking gtest_break_on_failure_unittest_ (a program written with

-Google Test) with different environments and command line flags.

-"""

-

-__author__ = '[email protected] (Zhanyong Wan)'

-

-import gtest_test_utils

-import os

-import sys

-

-

-# Constants.

-

-IS_WINDOWS = os.name == 'nt'

-

-# The environment variable for enabling/disabling the break-on-failure mode.

-BREAK_ON_FAILURE_ENV_VAR = 'GTEST_BREAK_ON_FAILURE'

-

-# The command line flag for enabling/disabling the break-on-failure mode.

-BREAK_ON_FAILURE_FLAG = 'gtest_break_on_failure'

-

-# The environment variable for enabling/disabling the throw-on-failure mode.

-THROW_ON_FAILURE_ENV_VAR = 'GTEST_THROW_ON_FAILURE'

-

-# The environment variable for enabling/disabling the catch-exceptions mode.

-CATCH_EXCEPTIONS_ENV_VAR = 'GTEST_CATCH_EXCEPTIONS'

-

-# Path to the gtest_break_on_failure_unittest_ program.

-EXE_PATH = gtest_test_utils.GetTestExecutablePath(

-    'gtest_break_on_failure_unittest_')

-

-

-# Utilities.

-

-

-def SetEnvVar(env_var, value):

-  """Sets an environment variable to a given value; unsets it when the

-  given value is None.

-  """

-

-  if value is not None:

-    os.environ[env_var] = value

-  elif env_var in os.environ:

-    del os.environ[env_var]

-

-

-def Run(command):

-  """Runs a command; returns 1 if it was killed by a signal, or 0 otherwise."""

-

-  p = gtest_test_utils.Subprocess(command)

-  if p.terminated_by_signal:

-    return 1

-  else:

-    return 0

-

-

-# The tests.

-

-

-class GTestBreakOnFailureUnitTest(gtest_test_utils.TestCase):

-  """Tests using the GTEST_BREAK_ON_FAILURE environment variable or

-  the --gtest_break_on_failure flag to turn assertion failures into

-  segmentation faults.

-  """

-

-  def RunAndVerify(self, env_var_value, flag_value, expect_seg_fault):

-    """Runs gtest_break_on_failure_unittest_ and verifies that it does

-    (or does not) have a seg-fault.

-

-    Args:

-      env_var_value:    value of the GTEST_BREAK_ON_FAILURE environment

-                        variable; None if the variable should be unset.

-      flag_value:       value of the --gtest_break_on_failure flag;

-                        None if the flag should not be present.

-      expect_seg_fault: 1 if the program is expected to generate a seg-fault;

-                        0 otherwise.

-    """

-

-    SetEnvVar(BREAK_ON_FAILURE_ENV_VAR, env_var_value)

-

-    if env_var_value is None:

-      env_var_value_msg = ' is not set'

-    else:

-      env_var_value_msg = '=' + env_var_value

-

-    if flag_value is None:

-      flag = ''

-    elif flag_value == '0':

-      flag = '--%s=0' % BREAK_ON_FAILURE_FLAG

-    else:

-      flag = '--%s' % BREAK_ON_FAILURE_FLAG

-

-    command = [EXE_PATH]

-    if flag:

-      command.append(flag)

-

-    if expect_seg_fault:

-      should_or_not = 'should'

-    else:

-      should_or_not = 'should not'

-

-    has_seg_fault = Run(command)

-

-    SetEnvVar(BREAK_ON_FAILURE_ENV_VAR, None)

-

-    msg = ('when %s%s, an assertion failure in "%s" %s cause a seg-fault.' %

-           (BREAK_ON_FAILURE_ENV_VAR, env_var_value_msg, ' '.join(command),

-            should_or_not))

-    self.assert_(has_seg_fault == expect_seg_fault, msg)

-

-  def testDefaultBehavior(self):

-    """Tests the behavior of the default mode."""

-

-    self.RunAndVerify(env_var_value=None,

-                      flag_value=None,

-                      expect_seg_fault=0)

-

-  def testEnvVar(self):

-    """Tests using the GTEST_BREAK_ON_FAILURE environment variable."""

-

-    self.RunAndVerify(env_var_value='0',

-                      flag_value=None,

-                      expect_seg_fault=0)

-    self.RunAndVerify(env_var_value='1',

-                      flag_value=None,

-                      expect_seg_fault=1)

-

-  def testFlag(self):

-    """Tests using the --gtest_break_on_failure flag."""

-

-    self.RunAndVerify(env_var_value=None,

-                      flag_value='0',

-                      expect_seg_fault=0)

-    self.RunAndVerify(env_var_value=None,

-                      flag_value='1',

-                      expect_seg_fault=1)

-

-  def testFlagOverridesEnvVar(self):

-    """Tests that the flag overrides the environment variable."""

-

-    self.RunAndVerify(env_var_value='0',

-                      flag_value='0',

-                      expect_seg_fault=0)

-    self.RunAndVerify(env_var_value='0',

-                      flag_value='1',

-                      expect_seg_fault=1)

-    self.RunAndVerify(env_var_value='1',

-                      flag_value='0',

-                      expect_seg_fault=0)

-    self.RunAndVerify(env_var_value='1',

-                      flag_value='1',

-                      expect_seg_fault=1)

-

-  def testBreakOnFailureOverridesThrowOnFailure(self):

-    """Tests that gtest_break_on_failure overrides gtest_throw_on_failure."""

-

-    SetEnvVar(THROW_ON_FAILURE_ENV_VAR, '1')

-    try:

-      self.RunAndVerify(env_var_value=None,

-                        flag_value='1',

-                        expect_seg_fault=1)

-    finally:

-      SetEnvVar(THROW_ON_FAILURE_ENV_VAR, None)

-

-  if IS_WINDOWS:

-    def testCatchExceptionsDoesNotInterfere(self):

-      """Tests that gtest_catch_exceptions doesn't interfere."""

-

-      SetEnvVar(CATCH_EXCEPTIONS_ENV_VAR, '1')

-      try:

-        self.RunAndVerify(env_var_value='1',

-                          flag_value='1',

-                          expect_seg_fault=1)

-      finally:

-        SetEnvVar(CATCH_EXCEPTIONS_ENV_VAR, None)

-

-

-if __name__ == '__main__':

-  gtest_test_utils.Main()

+#!/usr/bin/env python
+#
+# Copyright 2006, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Unit test for Google Test's break-on-failure mode.
+
+A user can ask Google Test to seg-fault when an assertion fails, using
+either the GTEST_BREAK_ON_FAILURE environment variable or the
+--gtest_break_on_failure flag.  This script tests such functionality
+by invoking gtest_break_on_failure_unittest_ (a program written with
+Google Test) with different environments and command line flags.
+"""
+
+__author__ = '[email protected] (Zhanyong Wan)'
+
+import gtest_test_utils
+import os
+import sys
+
+
+# Constants.
+
+IS_WINDOWS = os.name == 'nt'
+
+# The environment variable for enabling/disabling the break-on-failure mode.
+BREAK_ON_FAILURE_ENV_VAR = 'GTEST_BREAK_ON_FAILURE'
+
+# The command line flag for enabling/disabling the break-on-failure mode.
+BREAK_ON_FAILURE_FLAG = 'gtest_break_on_failure'
+
+# The environment variable for enabling/disabling the throw-on-failure mode.
+THROW_ON_FAILURE_ENV_VAR = 'GTEST_THROW_ON_FAILURE'
+
+# The environment variable for enabling/disabling the catch-exceptions mode.
+CATCH_EXCEPTIONS_ENV_VAR = 'GTEST_CATCH_EXCEPTIONS'
+
+# Path to the gtest_break_on_failure_unittest_ program.
+EXE_PATH = gtest_test_utils.GetTestExecutablePath(
+    'gtest_break_on_failure_unittest_')
+
+
+# Utilities.
+
+
+def SetEnvVar(env_var, value):
+  """Sets an environment variable to a given value; unsets it when the
+  given value is None.
+  """
+
+  if value is not None:
+    os.environ[env_var] = value
+  elif env_var in os.environ:
+    del os.environ[env_var]
+
+
+def Run(command):
+  """Runs a command; returns 1 if it was killed by a signal, or 0 otherwise."""
+
+  p = gtest_test_utils.Subprocess(command)
+  if p.terminated_by_signal:
+    return 1
+  else:
+    return 0
+
+
+# The tests.
+
+
+class GTestBreakOnFailureUnitTest(gtest_test_utils.TestCase):
+  """Tests using the GTEST_BREAK_ON_FAILURE environment variable or
+  the --gtest_break_on_failure flag to turn assertion failures into
+  segmentation faults.
+  """
+
+  def RunAndVerify(self, env_var_value, flag_value, expect_seg_fault):
+    """Runs gtest_break_on_failure_unittest_ and verifies that it does
+    (or does not) have a seg-fault.
+
+    Args:
+      env_var_value:    value of the GTEST_BREAK_ON_FAILURE environment
+                        variable; None if the variable should be unset.
+      flag_value:       value of the --gtest_break_on_failure flag;
+                        None if the flag should not be present.
+      expect_seg_fault: 1 if the program is expected to generate a seg-fault;
+                        0 otherwise.
+    """
+
+    SetEnvVar(BREAK_ON_FAILURE_ENV_VAR, env_var_value)
+
+    if env_var_value is None:
+      env_var_value_msg = ' is not set'
+    else:
+      env_var_value_msg = '=' + env_var_value
+
+    if flag_value is None:
+      flag = ''
+    elif flag_value == '0':
+      flag = '--%s=0' % BREAK_ON_FAILURE_FLAG
+    else:
+      flag = '--%s' % BREAK_ON_FAILURE_FLAG
+
+    command = [EXE_PATH]
+    if flag:
+      command.append(flag)
+
+    if expect_seg_fault:
+      should_or_not = 'should'
+    else:
+      should_or_not = 'should not'
+
+    has_seg_fault = Run(command)
+
+    SetEnvVar(BREAK_ON_FAILURE_ENV_VAR, None)
+
+    msg = ('when %s%s, an assertion failure in "%s" %s cause a seg-fault.' %
+           (BREAK_ON_FAILURE_ENV_VAR, env_var_value_msg, ' '.join(command),
+            should_or_not))
+    self.assert_(has_seg_fault == expect_seg_fault, msg)
+
+  def testDefaultBehavior(self):
+    """Tests the behavior of the default mode."""
+
+    self.RunAndVerify(env_var_value=None,
+                      flag_value=None,
+                      expect_seg_fault=0)
+
+  def testEnvVar(self):
+    """Tests using the GTEST_BREAK_ON_FAILURE environment variable."""
+
+    self.RunAndVerify(env_var_value='0',
+                      flag_value=None,
+                      expect_seg_fault=0)
+    self.RunAndVerify(env_var_value='1',
+                      flag_value=None,
+                      expect_seg_fault=1)
+
+  def testFlag(self):
+    """Tests using the --gtest_break_on_failure flag."""
+
+    self.RunAndVerify(env_var_value=None,
+                      flag_value='0',
+                      expect_seg_fault=0)
+    self.RunAndVerify(env_var_value=None,
+                      flag_value='1',
+                      expect_seg_fault=1)
+
+  def testFlagOverridesEnvVar(self):
+    """Tests that the flag overrides the environment variable."""
+
+    self.RunAndVerify(env_var_value='0',
+                      flag_value='0',
+                      expect_seg_fault=0)
+    self.RunAndVerify(env_var_value='0',
+                      flag_value='1',
+                      expect_seg_fault=1)
+    self.RunAndVerify(env_var_value='1',
+                      flag_value='0',
+                      expect_seg_fault=0)
+    self.RunAndVerify(env_var_value='1',
+                      flag_value='1',
+                      expect_seg_fault=1)
+
+  def testBreakOnFailureOverridesThrowOnFailure(self):
+    """Tests that gtest_break_on_failure overrides gtest_throw_on_failure."""
+
+    SetEnvVar(THROW_ON_FAILURE_ENV_VAR, '1')
+    try:
+      self.RunAndVerify(env_var_value=None,
+                        flag_value='1',
+                        expect_seg_fault=1)
+    finally:
+      SetEnvVar(THROW_ON_FAILURE_ENV_VAR, None)
+
+  if IS_WINDOWS:
+    def testCatchExceptionsDoesNotInterfere(self):
+      """Tests that gtest_catch_exceptions doesn't interfere."""
+
+      SetEnvVar(CATCH_EXCEPTIONS_ENV_VAR, '1')
+      try:
+        self.RunAndVerify(env_var_value='1',
+                          flag_value='1',
+                          expect_seg_fault=1)
+      finally:
+        SetEnvVar(CATCH_EXCEPTIONS_ENV_VAR, None)
+
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_color_test.py b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_color_test.py
index 8fce2453..d02a53ed 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_color_test.py
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_color_test.py
@@ -1,130 +1,130 @@
-#!/usr/bin/env python

-#

-# Copyright 2008, Google Inc.

-# All rights reserved.

-#

-# Redistribution and use in source and binary forms, with or without

-# modification, are permitted provided that the following conditions are

-# met:

-#

-#     * Redistributions of source code must retain the above copyright

-# notice, this list of conditions and the following disclaimer.

-#     * Redistributions in binary form must reproduce the above

-# copyright notice, this list of conditions and the following disclaimer

-# in the documentation and/or other materials provided with the

-# distribution.

-#     * Neither the name of Google Inc. nor the names of its

-# contributors may be used to endorse or promote products derived from

-# this software without specific prior written permission.

-#

-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-"""Verifies that Google Test correctly determines whether to use colors."""

-

-__author__ = '[email protected] (Zhanyong Wan)'

-

-import os

-import gtest_test_utils

-

-

-IS_WINDOWS = os.name = 'nt'

-

-COLOR_ENV_VAR = 'GTEST_COLOR'

-COLOR_FLAG = 'gtest_color'

-COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_color_test_')

-

-

-def SetEnvVar(env_var, value):

-  """Sets the env variable to 'value'; unsets it when 'value' is None."""

-

-  if value is not None:

-    os.environ[env_var] = value

-  elif env_var in os.environ:

-    del os.environ[env_var]

-

-

-def UsesColor(term, color_env_var, color_flag):

-  """Runs gtest_color_test_ and returns its exit code."""

-

-  SetEnvVar('TERM', term)

-  SetEnvVar(COLOR_ENV_VAR, color_env_var)

-

-  if color_flag is None:

-    args = []

-  else:

-    args = ['--%s=%s' % (COLOR_FLAG, color_flag)]

-  p = gtest_test_utils.Subprocess([COMMAND] + args)

-  return not p.exited or p.exit_code

-

-

-class GTestColorTest(gtest_test_utils.TestCase):

-  def testNoEnvVarNoFlag(self):

-    """Tests the case when there's neither GTEST_COLOR nor --gtest_color."""

-

-    if not IS_WINDOWS:

-      self.assert_(not UsesColor('dumb', None, None))

-      self.assert_(not UsesColor('emacs', None, None))

-      self.assert_(not UsesColor('xterm-mono', None, None))

-      self.assert_(not UsesColor('unknown', None, None))

-      self.assert_(not UsesColor(None, None, None))

-    self.assert_(UsesColor('linux', None, None))

-    self.assert_(UsesColor('cygwin', None, None))

-    self.assert_(UsesColor('xterm', None, None))

-    self.assert_(UsesColor('xterm-color', None, None))

-    self.assert_(UsesColor('xterm-256color', None, None))

-

-  def testFlagOnly(self):

-    """Tests the case when there's --gtest_color but not GTEST_COLOR."""

-

-    self.assert_(not UsesColor('dumb', None, 'no'))

-    self.assert_(not UsesColor('xterm-color', None, 'no'))

-    if not IS_WINDOWS:

-      self.assert_(not UsesColor('emacs', None, 'auto'))

-    self.assert_(UsesColor('xterm', None, 'auto'))

-    self.assert_(UsesColor('dumb', None, 'yes'))

-    self.assert_(UsesColor('xterm', None, 'yes'))

-

-  def testEnvVarOnly(self):

-    """Tests the case when there's GTEST_COLOR but not --gtest_color."""

-

-    self.assert_(not UsesColor('dumb', 'no', None))

-    self.assert_(not UsesColor('xterm-color', 'no', None))

-    if not IS_WINDOWS:

-      self.assert_(not UsesColor('dumb', 'auto', None))

-    self.assert_(UsesColor('xterm-color', 'auto', None))

-    self.assert_(UsesColor('dumb', 'yes', None))

-    self.assert_(UsesColor('xterm-color', 'yes', None))

-

-  def testEnvVarAndFlag(self):

-    """Tests the case when there are both GTEST_COLOR and --gtest_color."""

-

-    self.assert_(not UsesColor('xterm-color', 'no', 'no'))

-    self.assert_(UsesColor('dumb', 'no', 'yes'))

-    self.assert_(UsesColor('xterm-color', 'no', 'auto'))

-

-  def testAliasesOfYesAndNo(self):

-    """Tests using aliases in specifying --gtest_color."""

-

-    self.assert_(UsesColor('dumb', None, 'true'))

-    self.assert_(UsesColor('dumb', None, 'YES'))

-    self.assert_(UsesColor('dumb', None, 'T'))

-    self.assert_(UsesColor('dumb', None, '1'))

-

-    self.assert_(not UsesColor('xterm', None, 'f'))

-    self.assert_(not UsesColor('xterm', None, 'false'))

-    self.assert_(not UsesColor('xterm', None, '0'))

-    self.assert_(not UsesColor('xterm', None, 'unknown'))

-

-

-if __name__ == '__main__':

-  gtest_test_utils.Main()

+#!/usr/bin/env python
+#
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Verifies that Google Test correctly determines whether to use colors."""
+
+__author__ = '[email protected] (Zhanyong Wan)'
+
+import os
+import gtest_test_utils
+
+
+IS_WINDOWS = os.name = 'nt'
+
+COLOR_ENV_VAR = 'GTEST_COLOR'
+COLOR_FLAG = 'gtest_color'
+COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_color_test_')
+
+
+def SetEnvVar(env_var, value):
+  """Sets the env variable to 'value'; unsets it when 'value' is None."""
+
+  if value is not None:
+    os.environ[env_var] = value
+  elif env_var in os.environ:
+    del os.environ[env_var]
+
+
+def UsesColor(term, color_env_var, color_flag):
+  """Runs gtest_color_test_ and returns its exit code."""
+
+  SetEnvVar('TERM', term)
+  SetEnvVar(COLOR_ENV_VAR, color_env_var)
+
+  if color_flag is None:
+    args = []
+  else:
+    args = ['--%s=%s' % (COLOR_FLAG, color_flag)]
+  p = gtest_test_utils.Subprocess([COMMAND] + args)
+  return not p.exited or p.exit_code
+
+
+class GTestColorTest(gtest_test_utils.TestCase):
+  def testNoEnvVarNoFlag(self):
+    """Tests the case when there's neither GTEST_COLOR nor --gtest_color."""
+
+    if not IS_WINDOWS:
+      self.assert_(not UsesColor('dumb', None, None))
+      self.assert_(not UsesColor('emacs', None, None))
+      self.assert_(not UsesColor('xterm-mono', None, None))
+      self.assert_(not UsesColor('unknown', None, None))
+      self.assert_(not UsesColor(None, None, None))
+    self.assert_(UsesColor('linux', None, None))
+    self.assert_(UsesColor('cygwin', None, None))
+    self.assert_(UsesColor('xterm', None, None))
+    self.assert_(UsesColor('xterm-color', None, None))
+    self.assert_(UsesColor('xterm-256color', None, None))
+
+  def testFlagOnly(self):
+    """Tests the case when there's --gtest_color but not GTEST_COLOR."""
+
+    self.assert_(not UsesColor('dumb', None, 'no'))
+    self.assert_(not UsesColor('xterm-color', None, 'no'))
+    if not IS_WINDOWS:
+      self.assert_(not UsesColor('emacs', None, 'auto'))
+    self.assert_(UsesColor('xterm', None, 'auto'))
+    self.assert_(UsesColor('dumb', None, 'yes'))
+    self.assert_(UsesColor('xterm', None, 'yes'))
+
+  def testEnvVarOnly(self):
+    """Tests the case when there's GTEST_COLOR but not --gtest_color."""
+
+    self.assert_(not UsesColor('dumb', 'no', None))
+    self.assert_(not UsesColor('xterm-color', 'no', None))
+    if not IS_WINDOWS:
+      self.assert_(not UsesColor('dumb', 'auto', None))
+    self.assert_(UsesColor('xterm-color', 'auto', None))
+    self.assert_(UsesColor('dumb', 'yes', None))
+    self.assert_(UsesColor('xterm-color', 'yes', None))
+
+  def testEnvVarAndFlag(self):
+    """Tests the case when there are both GTEST_COLOR and --gtest_color."""
+
+    self.assert_(not UsesColor('xterm-color', 'no', 'no'))
+    self.assert_(UsesColor('dumb', 'no', 'yes'))
+    self.assert_(UsesColor('xterm-color', 'no', 'auto'))
+
+  def testAliasesOfYesAndNo(self):
+    """Tests using aliases in specifying --gtest_color."""
+
+    self.assert_(UsesColor('dumb', None, 'true'))
+    self.assert_(UsesColor('dumb', None, 'YES'))
+    self.assert_(UsesColor('dumb', None, 'T'))
+    self.assert_(UsesColor('dumb', None, '1'))
+
+    self.assert_(not UsesColor('xterm', None, 'f'))
+    self.assert_(not UsesColor('xterm', None, 'false'))
+    self.assert_(not UsesColor('xterm', None, '0'))
+    self.assert_(not UsesColor('xterm', None, 'unknown'))
+
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_env_var_test.py b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_env_var_test.py
index 40eed527..f8250d4c 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_env_var_test.py
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_env_var_test.py
@@ -1,103 +1,103 @@
-#!/usr/bin/env python

-#

-# Copyright 2008, Google Inc.

-# All rights reserved.

-#

-# Redistribution and use in source and binary forms, with or without

-# modification, are permitted provided that the following conditions are

-# met:

-#

-#     * Redistributions of source code must retain the above copyright

-# notice, this list of conditions and the following disclaimer.

-#     * Redistributions in binary form must reproduce the above

-# copyright notice, this list of conditions and the following disclaimer

-# in the documentation and/or other materials provided with the

-# distribution.

-#     * Neither the name of Google Inc. nor the names of its

-# contributors may be used to endorse or promote products derived from

-# this software without specific prior written permission.

-#

-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-"""Verifies that Google Test correctly parses environment variables."""

-

-__author__ = '[email protected] (Zhanyong Wan)'

-

-import os

-import gtest_test_utils

-

-

-IS_WINDOWS = os.name == 'nt'

-IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'

-

-COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_env_var_test_')

-

-

-def AssertEq(expected, actual):

-  if expected != actual:

-    print 'Expected: %s' % (expected,)

-    print '  Actual: %s' % (actual,)

-    raise AssertionError

-

-

-def SetEnvVar(env_var, value):

-  """Sets the env variable to 'value'; unsets it when 'value' is None."""

-

-  if value is not None:

-    os.environ[env_var] = value

-  elif env_var in os.environ:

-    del os.environ[env_var]

-

-

-def GetFlag(flag):

-  """Runs gtest_env_var_test_ and returns its output."""

-

-  args = [COMMAND]

-  if flag is not None:

-    args += [flag]

-  return gtest_test_utils.Subprocess(args).output

-

-

-def TestFlag(flag, test_val, default_val):

-  """Verifies that the given flag is affected by the corresponding env var."""

-

-  env_var = 'GTEST_' + flag.upper()

-  SetEnvVar(env_var, test_val)

-  AssertEq(test_val, GetFlag(flag))

-  SetEnvVar(env_var, None)

-  AssertEq(default_val, GetFlag(flag))

-

-

-class GTestEnvVarTest(gtest_test_utils.TestCase):

-  def testEnvVarAffectsFlag(self):

-    """Tests that environment variable should affect the corresponding flag."""

-

-    TestFlag('break_on_failure', '1', '0')

-    TestFlag('color', 'yes', 'auto')

-    TestFlag('filter', 'FooTest.Bar', '*')

-    TestFlag('output', 'xml:tmp/foo.xml', '')

-    TestFlag('print_time', '0', '1')

-    TestFlag('repeat', '999', '1')

-    TestFlag('throw_on_failure', '1', '0')

-    TestFlag('death_test_style', 'threadsafe', 'fast')

-

-    if IS_WINDOWS:

-      TestFlag('catch_exceptions', '1', '0')

-

-    if IS_LINUX:

-      TestFlag('death_test_use_fork', '1', '0')

-      TestFlag('stack_trace_depth', '0', '100')

-

-

-if __name__ == '__main__':

-  gtest_test_utils.Main()

+#!/usr/bin/env python
+#
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Verifies that Google Test correctly parses environment variables."""
+
+__author__ = '[email protected] (Zhanyong Wan)'
+
+import os
+import gtest_test_utils
+
+
+IS_WINDOWS = os.name == 'nt'
+IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
+
+COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_env_var_test_')
+
+
+def AssertEq(expected, actual):
+  if expected != actual:
+    print 'Expected: %s' % (expected,)
+    print '  Actual: %s' % (actual,)
+    raise AssertionError
+
+
+def SetEnvVar(env_var, value):
+  """Sets the env variable to 'value'; unsets it when 'value' is None."""
+
+  if value is not None:
+    os.environ[env_var] = value
+  elif env_var in os.environ:
+    del os.environ[env_var]
+
+
+def GetFlag(flag):
+  """Runs gtest_env_var_test_ and returns its output."""
+
+  args = [COMMAND]
+  if flag is not None:
+    args += [flag]
+  return gtest_test_utils.Subprocess(args).output
+
+
+def TestFlag(flag, test_val, default_val):
+  """Verifies that the given flag is affected by the corresponding env var."""
+
+  env_var = 'GTEST_' + flag.upper()
+  SetEnvVar(env_var, test_val)
+  AssertEq(test_val, GetFlag(flag))
+  SetEnvVar(env_var, None)
+  AssertEq(default_val, GetFlag(flag))
+
+
+class GTestEnvVarTest(gtest_test_utils.TestCase):
+  def testEnvVarAffectsFlag(self):
+    """Tests that environment variable should affect the corresponding flag."""
+
+    TestFlag('break_on_failure', '1', '0')
+    TestFlag('color', 'yes', 'auto')
+    TestFlag('filter', 'FooTest.Bar', '*')
+    TestFlag('output', 'xml:tmp/foo.xml', '')
+    TestFlag('print_time', '0', '1')
+    TestFlag('repeat', '999', '1')
+    TestFlag('throw_on_failure', '1', '0')
+    TestFlag('death_test_style', 'threadsafe', 'fast')
+
+    if IS_WINDOWS:
+      TestFlag('catch_exceptions', '1', '0')
+
+    if IS_LINUX:
+      TestFlag('death_test_use_fork', '1', '0')
+      TestFlag('stack_trace_depth', '0', '100')
+
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_filter_unittest.py b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_filter_unittest.py
index d9778171..a94a5210 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_filter_unittest.py
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_filter_unittest.py
@@ -1,594 +1,594 @@
-#!/usr/bin/env python

-#

-# Copyright 2005 Google Inc. All Rights Reserved.

-#

-# Redistribution and use in source and binary forms, with or without

-# modification, are permitted provided that the following conditions are

-# met:

-#

-#     * Redistributions of source code must retain the above copyright

-# notice, this list of conditions and the following disclaimer.

-#     * Redistributions in binary form must reproduce the above

-# copyright notice, this list of conditions and the following disclaimer

-# in the documentation and/or other materials provided with the

-# distribution.

-#     * Neither the name of Google Inc. nor the names of its

-# contributors may be used to endorse or promote products derived from

-# this software without specific prior written permission.

-#

-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-"""Unit test for Google Test test filters.

-

-A user can specify which test(s) in a Google Test program to run via either

-the GTEST_FILTER environment variable or the --gtest_filter flag.

-This script tests such functionality by invoking

-gtest_filter_unittest_ (a program written with Google Test) with different

-environments and command line flags.

-

-Note that test sharding may also influence which tests are filtered. Therefore,

-we test that here also.

-"""

-

-__author__ = '[email protected] (Zhanyong Wan)'

-

-import os

-import re

-import sets

-import gtest_test_utils

-

-# Constants.

-

-IS_WINDOWS = os.name == 'nt'

-

-# The environment variable for specifying the test filters.

-FILTER_ENV_VAR = 'GTEST_FILTER'

-

-# The environment variables for test sharding.

-TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS'

-SHARD_INDEX_ENV_VAR = 'GTEST_SHARD_INDEX'

-SHARD_STATUS_FILE_ENV_VAR = 'GTEST_SHARD_STATUS_FILE'

-

-# The command line flag for specifying the test filters.

-FILTER_FLAG = 'gtest_filter'

-

-# The command line flag for including disabled tests.

-ALSO_RUN_DISABED_TESTS_FLAG = 'gtest_also_run_disabled_tests'

-

-# Command to run the gtest_filter_unittest_ program.

-COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_filter_unittest_')

-

-# Regex for determining whether parameterized tests are enabled in the binary.

-PARAM_TEST_REGEX = re.compile(r'/ParamTest')

-

-# Regex for parsing test case names from Google Test's output.

-TEST_CASE_REGEX = re.compile(r'^\[\-+\] \d+ tests? from (\w+(/\w+)?)')

-

-# Regex for parsing test names from Google Test's output.

-TEST_REGEX = re.compile(r'^\[\s*RUN\s*\].*\.(\w+(/\w+)?)')

-

-# Full names of all tests in gtest_filter_unittests_.

-PARAM_TESTS = [

-    'SeqP/ParamTest.TestX/0',

-    'SeqP/ParamTest.TestX/1',

-    'SeqP/ParamTest.TestY/0',

-    'SeqP/ParamTest.TestY/1',

-    'SeqQ/ParamTest.TestX/0',

-    'SeqQ/ParamTest.TestX/1',

-    'SeqQ/ParamTest.TestY/0',

-    'SeqQ/ParamTest.TestY/1',

-    ]

-

-DISABLED_TESTS = [

-    'BarTest.DISABLED_TestFour',

-    'BarTest.DISABLED_TestFive',

-    'BazTest.DISABLED_TestC',

-    'DISABLED_FoobarTest.Test1',

-    'DISABLED_FoobarTest.DISABLED_Test2',

-    'DISABLED_FoobarbazTest.TestA',

-    ]

-

-# All the non-disabled tests.

-ACTIVE_TESTS = [

-    'FooTest.Abc',

-    'FooTest.Xyz',

-

-    'BarTest.TestOne',

-    'BarTest.TestTwo',

-    'BarTest.TestThree',

-

-    'BazTest.TestOne',

-    'BazTest.TestA',

-    'BazTest.TestB',

-

-    'HasDeathTest.Test1',

-    'HasDeathTest.Test2',

-    ] + PARAM_TESTS

-

-param_tests_present = None

-

-# Utilities.

-

-

-def SetEnvVar(env_var, value):

-  """Sets the env variable to 'value'; unsets it when 'value' is None."""

-

-  if value is not None:

-    os.environ[env_var] = value

-  elif env_var in os.environ:

-    del os.environ[env_var]

-

-

-def RunAndReturnOutput(args = None):

-  """Runs the test program and returns its output."""

-

-  return gtest_test_utils.Subprocess([COMMAND] + (args or [])).output

-

-

-def RunAndExtractTestList(args = None):

-  """Runs the test program and returns its exit code and a list of tests run."""

-

-  p = gtest_test_utils.Subprocess([COMMAND] + (args or []))

-  tests_run = []

-  test_case = ''

-  test = ''

-  for line in p.output.split('\n'):

-    match = TEST_CASE_REGEX.match(line)

-    if match is not None:

-      test_case = match.group(1)

-    else:

-      match = TEST_REGEX.match(line)

-      if match is not None:

-        test = match.group(1)

-        tests_run.append(test_case + '.' + test)

-  return (tests_run, p.exit_code)

-

-

-def InvokeWithModifiedEnv(extra_env, function, *args, **kwargs):

-  """Runs the given function and arguments in a modified environment."""

-  try:

-    original_env = os.environ.copy()

-    os.environ.update(extra_env)

-    return function(*args, **kwargs)

-  finally:

-    for key in extra_env.iterkeys():

-      if key in original_env:

-        os.environ[key] = original_env[key]

-      else:

-        del os.environ[key]

-

-

-def RunWithSharding(total_shards, shard_index, command):

-  """Runs a test program shard and returns exit code and a list of tests run."""

-

-  extra_env = {SHARD_INDEX_ENV_VAR: str(shard_index),

-               TOTAL_SHARDS_ENV_VAR: str(total_shards)}

-  return InvokeWithModifiedEnv(extra_env, RunAndExtractTestList, command)

-

-# The unit test.

-

-

-class GTestFilterUnitTest(gtest_test_utils.TestCase):

-  """Tests GTEST_FILTER env variable or --gtest_filter flag to filter tests."""

-

-  # Utilities.

-

-  def AssertSetEqual(self, lhs, rhs):

-    """Asserts that two sets are equal."""

-

-    for elem in lhs:

-      self.assert_(elem in rhs, '%s in %s' % (elem, rhs))

-

-    for elem in rhs:

-      self.assert_(elem in lhs, '%s in %s' % (elem, lhs))

-

-  def AssertPartitionIsValid(self, set_var, list_of_sets):

-    """Asserts that list_of_sets is a valid partition of set_var."""

-

-    full_partition = []

-    for slice_var in list_of_sets:

-      full_partition.extend(slice_var)

-    self.assertEqual(len(set_var), len(full_partition))

-    self.assertEqual(sets.Set(set_var), sets.Set(full_partition))

-

-  def AdjustForParameterizedTests(self, tests_to_run):

-    """Adjust tests_to_run in case value parameterized tests are disabled."""

-

-    global param_tests_present

-    if not param_tests_present:

-      return list(sets.Set(tests_to_run) - sets.Set(PARAM_TESTS))

-    else:

-      return tests_to_run

-

-  def RunAndVerify(self, gtest_filter, tests_to_run):

-    """Checks that the binary runs correct set of tests for the given filter."""

-

-    tests_to_run = self.AdjustForParameterizedTests(tests_to_run)

-

-    # First, tests using GTEST_FILTER.

-

-    # Windows removes empty variables from the environment when passing it

-    # to a new process. This means it is impossible to pass an empty filter

-    # into a process using the GTEST_FILTER environment variable. However,

-    # we can still test the case when the variable is not supplied (i.e.,

-    # gtest_filter is None).

-    # pylint: disable-msg=C6403

-    if not IS_WINDOWS or gtest_filter != '':

-      SetEnvVar(FILTER_ENV_VAR, gtest_filter)

-      tests_run = RunAndExtractTestList()[0]

-      SetEnvVar(FILTER_ENV_VAR, None)

-      self.AssertSetEqual(tests_run, tests_to_run)

-    # pylint: enable-msg=C6403

-

-    # Next, tests using --gtest_filter.

-

-    if gtest_filter is None:

-      args = []

-    else:

-      args = ['--%s=%s' % (FILTER_FLAG, gtest_filter)]

-

-    tests_run = RunAndExtractTestList(args)[0]

-    self.AssertSetEqual(tests_run, tests_to_run)

-

-  def RunAndVerifyWithSharding(self, gtest_filter, total_shards, tests_to_run,

-                               args=None, check_exit_0=False):

-    """Checks that binary runs correct tests for the given filter and shard.

-

-    Runs all shards of gtest_filter_unittest_ with the given filter, and

-    verifies that the right set of tests were run. The union of tests run

-    on each shard should be identical to tests_to_run, without duplicates.

-

-    Args:

-      gtest_filter: A filter to apply to the tests.

-      total_shards: A total number of shards to split test run into.

-      tests_to_run: A set of tests expected to run.

-      args   :      Arguments to pass to the to the test binary.

-      check_exit_0: When set to a true value, make sure that all shards

-                    return 0.

-    """

-

-    tests_to_run = self.AdjustForParameterizedTests(tests_to_run)

-

-    # Windows removes empty variables from the environment when passing it

-    # to a new process. This means it is impossible to pass an empty filter

-    # into a process using the GTEST_FILTER environment variable. However,

-    # we can still test the case when the variable is not supplied (i.e.,

-    # gtest_filter is None).

-    # pylint: disable-msg=C6403

-    if not IS_WINDOWS or gtest_filter != '':

-      SetEnvVar(FILTER_ENV_VAR, gtest_filter)

-      partition = []

-      for i in range(0, total_shards):

-        (tests_run, exit_code) = RunWithSharding(total_shards, i, args)

-        if check_exit_0:

-          self.assertEqual(0, exit_code)

-        partition.append(tests_run)

-

-      self.AssertPartitionIsValid(tests_to_run, partition)

-      SetEnvVar(FILTER_ENV_VAR, None)

-    # pylint: enable-msg=C6403

-

-  def RunAndVerifyAllowingDisabled(self, gtest_filter, tests_to_run):

-    """Checks that the binary runs correct set of tests for the given filter.

-

-    Runs gtest_filter_unittest_ with the given filter, and enables

-    disabled tests. Verifies that the right set of tests were run.

-

-    Args:

-      gtest_filter: A filter to apply to the tests.

-      tests_to_run: A set of tests expected to run.

-    """

-

-    tests_to_run = self.AdjustForParameterizedTests(tests_to_run)

-

-    # Construct the command line.

-    args = ['--%s' % ALSO_RUN_DISABED_TESTS_FLAG]

-    if gtest_filter is not None:

-      args.append('--%s=%s' % (FILTER_FLAG, gtest_filter))

-

-    tests_run = RunAndExtractTestList(args)[0]

-    self.AssertSetEqual(tests_run, tests_to_run)

-

-  def setUp(self):

-    """Sets up test case.

-

-    Determines whether value-parameterized tests are enabled in the binary and

-    sets the flags accordingly.

-    """

-

-    global param_tests_present

-    if param_tests_present is None:

-      param_tests_present = PARAM_TEST_REGEX.search(

-          RunAndReturnOutput()) is not None

-

-  def testDefaultBehavior(self):

-    """Tests the behavior of not specifying the filter."""

-

-    self.RunAndVerify(None, ACTIVE_TESTS)

-

-  def testDefaultBehaviorWithShards(self):

-    """Tests the behavior without the filter, with sharding enabled."""

-

-    self.RunAndVerifyWithSharding(None, 1, ACTIVE_TESTS)

-    self.RunAndVerifyWithSharding(None, 2, ACTIVE_TESTS)

-    self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS) - 1, ACTIVE_TESTS)

-    self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS), ACTIVE_TESTS)

-    self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS) + 1, ACTIVE_TESTS)

-

-  def testEmptyFilter(self):

-    """Tests an empty filter."""

-

-    self.RunAndVerify('', [])

-    self.RunAndVerifyWithSharding('', 1, [])

-    self.RunAndVerifyWithSharding('', 2, [])

-

-  def testBadFilter(self):

-    """Tests a filter that matches nothing."""

-

-    self.RunAndVerify('BadFilter', [])

-    self.RunAndVerifyAllowingDisabled('BadFilter', [])

-

-  def testFullName(self):

-    """Tests filtering by full name."""

-

-    self.RunAndVerify('FooTest.Xyz', ['FooTest.Xyz'])

-    self.RunAndVerifyAllowingDisabled('FooTest.Xyz', ['FooTest.Xyz'])

-    self.RunAndVerifyWithSharding('FooTest.Xyz', 5, ['FooTest.Xyz'])

-

-  def testUniversalFilters(self):

-    """Tests filters that match everything."""

-

-    self.RunAndVerify('*', ACTIVE_TESTS)

-    self.RunAndVerify('*.*', ACTIVE_TESTS)

-    self.RunAndVerifyWithSharding('*.*', len(ACTIVE_TESTS) - 3, ACTIVE_TESTS)

-    self.RunAndVerifyAllowingDisabled('*', ACTIVE_TESTS + DISABLED_TESTS)

-    self.RunAndVerifyAllowingDisabled('*.*', ACTIVE_TESTS + DISABLED_TESTS)

-

-  def testFilterByTestCase(self):

-    """Tests filtering by test case name."""

-

-    self.RunAndVerify('FooTest.*', ['FooTest.Abc', 'FooTest.Xyz'])

-

-    BAZ_TESTS = ['BazTest.TestOne', 'BazTest.TestA', 'BazTest.TestB']

-    self.RunAndVerify('BazTest.*', BAZ_TESTS)

-    self.RunAndVerifyAllowingDisabled('BazTest.*',

-                                      BAZ_TESTS + ['BazTest.DISABLED_TestC'])

-

-  def testFilterByTest(self):

-    """Tests filtering by test name."""

-

-    self.RunAndVerify('*.TestOne', ['BarTest.TestOne', 'BazTest.TestOne'])

-

-  def testFilterDisabledTests(self):

-    """Select only the disabled tests to run."""

-

-    self.RunAndVerify('DISABLED_FoobarTest.Test1', [])

-    self.RunAndVerifyAllowingDisabled('DISABLED_FoobarTest.Test1',

-                                      ['DISABLED_FoobarTest.Test1'])

-

-    self.RunAndVerify('*DISABLED_*', [])

-    self.RunAndVerifyAllowingDisabled('*DISABLED_*', DISABLED_TESTS)

-

-    self.RunAndVerify('*.DISABLED_*', [])

-    self.RunAndVerifyAllowingDisabled('*.DISABLED_*', [

-        'BarTest.DISABLED_TestFour',

-        'BarTest.DISABLED_TestFive',

-        'BazTest.DISABLED_TestC',

-        'DISABLED_FoobarTest.DISABLED_Test2',

-        ])

-

-    self.RunAndVerify('DISABLED_*', [])

-    self.RunAndVerifyAllowingDisabled('DISABLED_*', [

-        'DISABLED_FoobarTest.Test1',

-        'DISABLED_FoobarTest.DISABLED_Test2',

-        'DISABLED_FoobarbazTest.TestA',

-        ])

-

-  def testWildcardInTestCaseName(self):

-    """Tests using wildcard in the test case name."""

-

-    self.RunAndVerify('*a*.*', [

-        'BarTest.TestOne',

-        'BarTest.TestTwo',

-        'BarTest.TestThree',

-

-        'BazTest.TestOne',

-        'BazTest.TestA',

-        'BazTest.TestB',

-

-        'HasDeathTest.Test1',

-        'HasDeathTest.Test2', ] + PARAM_TESTS)

-

-  def testWildcardInTestName(self):

-    """Tests using wildcard in the test name."""

-

-    self.RunAndVerify('*.*A*', ['FooTest.Abc', 'BazTest.TestA'])

-

-  def testFilterWithoutDot(self):

-    """Tests a filter that has no '.' in it."""

-

-    self.RunAndVerify('*z*', [

-        'FooTest.Xyz',

-

-        'BazTest.TestOne',

-        'BazTest.TestA',

-        'BazTest.TestB',

-        ])

-

-  def testTwoPatterns(self):

-    """Tests filters that consist of two patterns."""

-

-    self.RunAndVerify('Foo*.*:*A*', [

-        'FooTest.Abc',

-        'FooTest.Xyz',

-

-        'BazTest.TestA',

-        ])

-

-    # An empty pattern + a non-empty one

-    self.RunAndVerify(':*A*', ['FooTest.Abc', 'BazTest.TestA'])

-

-  def testThreePatterns(self):

-    """Tests filters that consist of three patterns."""

-

-    self.RunAndVerify('*oo*:*A*:*One', [

-        'FooTest.Abc',

-        'FooTest.Xyz',

-

-        'BarTest.TestOne',

-

-        'BazTest.TestOne',

-        'BazTest.TestA',

-        ])

-

-    # The 2nd pattern is empty.

-    self.RunAndVerify('*oo*::*One', [

-        'FooTest.Abc',

-        'FooTest.Xyz',

-

-        'BarTest.TestOne',

-

-        'BazTest.TestOne',

-        ])

-

-    # The last 2 patterns are empty.

-    self.RunAndVerify('*oo*::', [

-        'FooTest.Abc',

-        'FooTest.Xyz',

-        ])

-

-  def testNegativeFilters(self):

-    self.RunAndVerify('*-HasDeathTest.Test1', [

-        'FooTest.Abc',

-        'FooTest.Xyz',

-

-        'BarTest.TestOne',

-        'BarTest.TestTwo',

-        'BarTest.TestThree',

-

-        'BazTest.TestOne',

-        'BazTest.TestA',

-        'BazTest.TestB',

-

-        'HasDeathTest.Test2',

-        ] + PARAM_TESTS)

-

-    self.RunAndVerify('*-FooTest.Abc:HasDeathTest.*', [

-        'FooTest.Xyz',

-

-        'BarTest.TestOne',

-        'BarTest.TestTwo',

-        'BarTest.TestThree',

-

-        'BazTest.TestOne',

-        'BazTest.TestA',

-        'BazTest.TestB',

-        ] + PARAM_TESTS)

-

-    self.RunAndVerify('BarTest.*-BarTest.TestOne', [

-        'BarTest.TestTwo',

-        'BarTest.TestThree',

-        ])

-

-    # Tests without leading '*'.

-    self.RunAndVerify('-FooTest.Abc:FooTest.Xyz:HasDeathTest.*', [

-        'BarTest.TestOne',

-        'BarTest.TestTwo',

-        'BarTest.TestThree',

-

-        'BazTest.TestOne',

-        'BazTest.TestA',

-        'BazTest.TestB',

-        ] + PARAM_TESTS)

-

-    # Value parameterized tests.

-    self.RunAndVerify('*/*', PARAM_TESTS)

-

-    # Value parameterized tests filtering by the sequence name.

-    self.RunAndVerify('SeqP/*', [

-        'SeqP/ParamTest.TestX/0',

-        'SeqP/ParamTest.TestX/1',

-        'SeqP/ParamTest.TestY/0',

-        'SeqP/ParamTest.TestY/1',

-        ])

-

-    # Value parameterized tests filtering by the test name.

-    self.RunAndVerify('*/0', [

-        'SeqP/ParamTest.TestX/0',

-        'SeqP/ParamTest.TestY/0',

-        'SeqQ/ParamTest.TestX/0',

-        'SeqQ/ParamTest.TestY/0',

-        ])

-

-  def testFlagOverridesEnvVar(self):

-    """Tests that the filter flag overrides the filtering env. variable."""

-

-    SetEnvVar(FILTER_ENV_VAR, 'Foo*')

-    args = ['--%s=%s' % (FILTER_FLAG, '*One')]

-    tests_run = RunAndExtractTestList(args)[0]

-    SetEnvVar(FILTER_ENV_VAR, None)

-

-    self.AssertSetEqual(tests_run, ['BarTest.TestOne', 'BazTest.TestOne'])

-

-  def testShardStatusFileIsCreated(self):

-    """Tests that the shard file is created if specified in the environment."""

-

-    shard_status_file = os.path.join(gtest_test_utils.GetTempDir(),

-                                     'shard_status_file')

-    self.assert_(not os.path.exists(shard_status_file))

-

-    extra_env = {SHARD_STATUS_FILE_ENV_VAR: shard_status_file}

-    try:

-      InvokeWithModifiedEnv(extra_env, RunAndReturnOutput)

-    finally:

-      self.assert_(os.path.exists(shard_status_file))

-      os.remove(shard_status_file)

-

-  def testShardStatusFileIsCreatedWithListTests(self):

-    """Tests that the shard file is created with --gtest_list_tests."""

-

-    shard_status_file = os.path.join(gtest_test_utils.GetTempDir(),

-                                     'shard_status_file2')

-    self.assert_(not os.path.exists(shard_status_file))

-

-    extra_env = {SHARD_STATUS_FILE_ENV_VAR: shard_status_file}

-    try:

-      InvokeWithModifiedEnv(extra_env,

-                            RunAndReturnOutput,

-                            ['--gtest_list_tests'])

-    finally:

-      self.assert_(os.path.exists(shard_status_file))

-      os.remove(shard_status_file)

-

-  def testShardingWorksWithDeathTests(self):

-    """Tests integration with death tests and sharding."""

-    gtest_filter = 'HasDeathTest.*:SeqP/*'

-    expected_tests = [

-        'HasDeathTest.Test1',

-        'HasDeathTest.Test2',

-

-        'SeqP/ParamTest.TestX/0',

-        'SeqP/ParamTest.TestX/1',

-        'SeqP/ParamTest.TestY/0',

-        'SeqP/ParamTest.TestY/1',

-        ]

-

-    for flag in ['--gtest_death_test_style=threadsafe',

-                 '--gtest_death_test_style=fast']:

-      self.RunAndVerifyWithSharding(gtest_filter, 3, expected_tests,

-                                    check_exit_0=True, args=[flag])

-      self.RunAndVerifyWithSharding(gtest_filter, 5, expected_tests,

-                                    check_exit_0=True, args=[flag])

-

-if __name__ == '__main__':

-  gtest_test_utils.Main()

+#!/usr/bin/env python
+#
+# Copyright 2005 Google Inc. All Rights Reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Unit test for Google Test test filters.
+
+A user can specify which test(s) in a Google Test program to run via either
+the GTEST_FILTER environment variable or the --gtest_filter flag.
+This script tests such functionality by invoking
+gtest_filter_unittest_ (a program written with Google Test) with different
+environments and command line flags.
+
+Note that test sharding may also influence which tests are filtered. Therefore,
+we test that here also.
+"""
+
+__author__ = '[email protected] (Zhanyong Wan)'
+
+import os
+import re
+import sets
+import gtest_test_utils
+
+# Constants.
+
+IS_WINDOWS = os.name == 'nt'
+
+# The environment variable for specifying the test filters.
+FILTER_ENV_VAR = 'GTEST_FILTER'
+
+# The environment variables for test sharding.
+TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS'
+SHARD_INDEX_ENV_VAR = 'GTEST_SHARD_INDEX'
+SHARD_STATUS_FILE_ENV_VAR = 'GTEST_SHARD_STATUS_FILE'
+
+# The command line flag for specifying the test filters.
+FILTER_FLAG = 'gtest_filter'
+
+# The command line flag for including disabled tests.
+ALSO_RUN_DISABED_TESTS_FLAG = 'gtest_also_run_disabled_tests'
+
+# Command to run the gtest_filter_unittest_ program.
+COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_filter_unittest_')
+
+# Regex for determining whether parameterized tests are enabled in the binary.
+PARAM_TEST_REGEX = re.compile(r'/ParamTest')
+
+# Regex for parsing test case names from Google Test's output.
+TEST_CASE_REGEX = re.compile(r'^\[\-+\] \d+ tests? from (\w+(/\w+)?)')
+
+# Regex for parsing test names from Google Test's output.
+TEST_REGEX = re.compile(r'^\[\s*RUN\s*\].*\.(\w+(/\w+)?)')
+
+# Full names of all tests in gtest_filter_unittests_.
+PARAM_TESTS = [
+    'SeqP/ParamTest.TestX/0',
+    'SeqP/ParamTest.TestX/1',
+    'SeqP/ParamTest.TestY/0',
+    'SeqP/ParamTest.TestY/1',
+    'SeqQ/ParamTest.TestX/0',
+    'SeqQ/ParamTest.TestX/1',
+    'SeqQ/ParamTest.TestY/0',
+    'SeqQ/ParamTest.TestY/1',
+    ]
+
+DISABLED_TESTS = [
+    'BarTest.DISABLED_TestFour',
+    'BarTest.DISABLED_TestFive',
+    'BazTest.DISABLED_TestC',
+    'DISABLED_FoobarTest.Test1',
+    'DISABLED_FoobarTest.DISABLED_Test2',
+    'DISABLED_FoobarbazTest.TestA',
+    ]
+
+# All the non-disabled tests.
+ACTIVE_TESTS = [
+    'FooTest.Abc',
+    'FooTest.Xyz',
+
+    'BarTest.TestOne',
+    'BarTest.TestTwo',
+    'BarTest.TestThree',
+
+    'BazTest.TestOne',
+    'BazTest.TestA',
+    'BazTest.TestB',
+
+    'HasDeathTest.Test1',
+    'HasDeathTest.Test2',
+    ] + PARAM_TESTS
+
+param_tests_present = None
+
+# Utilities.
+
+
+def SetEnvVar(env_var, value):
+  """Sets the env variable to 'value'; unsets it when 'value' is None."""
+
+  if value is not None:
+    os.environ[env_var] = value
+  elif env_var in os.environ:
+    del os.environ[env_var]
+
+
+def RunAndReturnOutput(args = None):
+  """Runs the test program and returns its output."""
+
+  return gtest_test_utils.Subprocess([COMMAND] + (args or [])).output
+
+
+def RunAndExtractTestList(args = None):
+  """Runs the test program and returns its exit code and a list of tests run."""
+
+  p = gtest_test_utils.Subprocess([COMMAND] + (args or []))
+  tests_run = []
+  test_case = ''
+  test = ''
+  for line in p.output.split('\n'):
+    match = TEST_CASE_REGEX.match(line)
+    if match is not None:
+      test_case = match.group(1)
+    else:
+      match = TEST_REGEX.match(line)
+      if match is not None:
+        test = match.group(1)
+        tests_run.append(test_case + '.' + test)
+  return (tests_run, p.exit_code)
+
+
+def InvokeWithModifiedEnv(extra_env, function, *args, **kwargs):
+  """Runs the given function and arguments in a modified environment."""
+  try:
+    original_env = os.environ.copy()
+    os.environ.update(extra_env)
+    return function(*args, **kwargs)
+  finally:
+    for key in extra_env.iterkeys():
+      if key in original_env:
+        os.environ[key] = original_env[key]
+      else:
+        del os.environ[key]
+
+
+def RunWithSharding(total_shards, shard_index, command):
+  """Runs a test program shard and returns exit code and a list of tests run."""
+
+  extra_env = {SHARD_INDEX_ENV_VAR: str(shard_index),
+               TOTAL_SHARDS_ENV_VAR: str(total_shards)}
+  return InvokeWithModifiedEnv(extra_env, RunAndExtractTestList, command)
+
+# The unit test.
+
+
+class GTestFilterUnitTest(gtest_test_utils.TestCase):
+  """Tests GTEST_FILTER env variable or --gtest_filter flag to filter tests."""
+
+  # Utilities.
+
+  def AssertSetEqual(self, lhs, rhs):
+    """Asserts that two sets are equal."""
+
+    for elem in lhs:
+      self.assert_(elem in rhs, '%s in %s' % (elem, rhs))
+
+    for elem in rhs:
+      self.assert_(elem in lhs, '%s in %s' % (elem, lhs))
+
+  def AssertPartitionIsValid(self, set_var, list_of_sets):
+    """Asserts that list_of_sets is a valid partition of set_var."""
+
+    full_partition = []
+    for slice_var in list_of_sets:
+      full_partition.extend(slice_var)
+    self.assertEqual(len(set_var), len(full_partition))
+    self.assertEqual(sets.Set(set_var), sets.Set(full_partition))
+
+  def AdjustForParameterizedTests(self, tests_to_run):
+    """Adjust tests_to_run in case value parameterized tests are disabled."""
+
+    global param_tests_present
+    if not param_tests_present:
+      return list(sets.Set(tests_to_run) - sets.Set(PARAM_TESTS))
+    else:
+      return tests_to_run
+
+  def RunAndVerify(self, gtest_filter, tests_to_run):
+    """Checks that the binary runs correct set of tests for the given filter."""
+
+    tests_to_run = self.AdjustForParameterizedTests(tests_to_run)
+
+    # First, tests using GTEST_FILTER.
+
+    # Windows removes empty variables from the environment when passing it
+    # to a new process. This means it is impossible to pass an empty filter
+    # into a process using the GTEST_FILTER environment variable. However,
+    # we can still test the case when the variable is not supplied (i.e.,
+    # gtest_filter is None).
+    # pylint: disable-msg=C6403
+    if not IS_WINDOWS or gtest_filter != '':
+      SetEnvVar(FILTER_ENV_VAR, gtest_filter)
+      tests_run = RunAndExtractTestList()[0]
+      SetEnvVar(FILTER_ENV_VAR, None)
+      self.AssertSetEqual(tests_run, tests_to_run)
+    # pylint: enable-msg=C6403
+
+    # Next, tests using --gtest_filter.
+
+    if gtest_filter is None:
+      args = []
+    else:
+      args = ['--%s=%s' % (FILTER_FLAG, gtest_filter)]
+
+    tests_run = RunAndExtractTestList(args)[0]
+    self.AssertSetEqual(tests_run, tests_to_run)
+
+  def RunAndVerifyWithSharding(self, gtest_filter, total_shards, tests_to_run,
+                               args=None, check_exit_0=False):
+    """Checks that binary runs correct tests for the given filter and shard.
+
+    Runs all shards of gtest_filter_unittest_ with the given filter, and
+    verifies that the right set of tests were run. The union of tests run
+    on each shard should be identical to tests_to_run, without duplicates.
+
+    Args:
+      gtest_filter: A filter to apply to the tests.
+      total_shards: A total number of shards to split test run into.
+      tests_to_run: A set of tests expected to run.
+      args   :      Arguments to pass to the to the test binary.
+      check_exit_0: When set to a true value, make sure that all shards
+                    return 0.
+    """
+
+    tests_to_run = self.AdjustForParameterizedTests(tests_to_run)
+
+    # Windows removes empty variables from the environment when passing it
+    # to a new process. This means it is impossible to pass an empty filter
+    # into a process using the GTEST_FILTER environment variable. However,
+    # we can still test the case when the variable is not supplied (i.e.,
+    # gtest_filter is None).
+    # pylint: disable-msg=C6403
+    if not IS_WINDOWS or gtest_filter != '':
+      SetEnvVar(FILTER_ENV_VAR, gtest_filter)
+      partition = []
+      for i in range(0, total_shards):
+        (tests_run, exit_code) = RunWithSharding(total_shards, i, args)
+        if check_exit_0:
+          self.assertEqual(0, exit_code)
+        partition.append(tests_run)
+
+      self.AssertPartitionIsValid(tests_to_run, partition)
+      SetEnvVar(FILTER_ENV_VAR, None)
+    # pylint: enable-msg=C6403
+
+  def RunAndVerifyAllowingDisabled(self, gtest_filter, tests_to_run):
+    """Checks that the binary runs correct set of tests for the given filter.
+
+    Runs gtest_filter_unittest_ with the given filter, and enables
+    disabled tests. Verifies that the right set of tests were run.
+
+    Args:
+      gtest_filter: A filter to apply to the tests.
+      tests_to_run: A set of tests expected to run.
+    """
+
+    tests_to_run = self.AdjustForParameterizedTests(tests_to_run)
+
+    # Construct the command line.
+    args = ['--%s' % ALSO_RUN_DISABED_TESTS_FLAG]
+    if gtest_filter is not None:
+      args.append('--%s=%s' % (FILTER_FLAG, gtest_filter))
+
+    tests_run = RunAndExtractTestList(args)[0]
+    self.AssertSetEqual(tests_run, tests_to_run)
+
+  def setUp(self):
+    """Sets up test case.
+
+    Determines whether value-parameterized tests are enabled in the binary and
+    sets the flags accordingly.
+    """
+
+    global param_tests_present
+    if param_tests_present is None:
+      param_tests_present = PARAM_TEST_REGEX.search(
+          RunAndReturnOutput()) is not None
+
+  def testDefaultBehavior(self):
+    """Tests the behavior of not specifying the filter."""
+
+    self.RunAndVerify(None, ACTIVE_TESTS)
+
+  def testDefaultBehaviorWithShards(self):
+    """Tests the behavior without the filter, with sharding enabled."""
+
+    self.RunAndVerifyWithSharding(None, 1, ACTIVE_TESTS)
+    self.RunAndVerifyWithSharding(None, 2, ACTIVE_TESTS)
+    self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS) - 1, ACTIVE_TESTS)
+    self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS), ACTIVE_TESTS)
+    self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS) + 1, ACTIVE_TESTS)
+
+  def testEmptyFilter(self):
+    """Tests an empty filter."""
+
+    self.RunAndVerify('', [])
+    self.RunAndVerifyWithSharding('', 1, [])
+    self.RunAndVerifyWithSharding('', 2, [])
+
+  def testBadFilter(self):
+    """Tests a filter that matches nothing."""
+
+    self.RunAndVerify('BadFilter', [])
+    self.RunAndVerifyAllowingDisabled('BadFilter', [])
+
+  def testFullName(self):
+    """Tests filtering by full name."""
+
+    self.RunAndVerify('FooTest.Xyz', ['FooTest.Xyz'])
+    self.RunAndVerifyAllowingDisabled('FooTest.Xyz', ['FooTest.Xyz'])
+    self.RunAndVerifyWithSharding('FooTest.Xyz', 5, ['FooTest.Xyz'])
+
+  def testUniversalFilters(self):
+    """Tests filters that match everything."""
+
+    self.RunAndVerify('*', ACTIVE_TESTS)
+    self.RunAndVerify('*.*', ACTIVE_TESTS)
+    self.RunAndVerifyWithSharding('*.*', len(ACTIVE_TESTS) - 3, ACTIVE_TESTS)
+    self.RunAndVerifyAllowingDisabled('*', ACTIVE_TESTS + DISABLED_TESTS)
+    self.RunAndVerifyAllowingDisabled('*.*', ACTIVE_TESTS + DISABLED_TESTS)
+
+  def testFilterByTestCase(self):
+    """Tests filtering by test case name."""
+
+    self.RunAndVerify('FooTest.*', ['FooTest.Abc', 'FooTest.Xyz'])
+
+    BAZ_TESTS = ['BazTest.TestOne', 'BazTest.TestA', 'BazTest.TestB']
+    self.RunAndVerify('BazTest.*', BAZ_TESTS)
+    self.RunAndVerifyAllowingDisabled('BazTest.*',
+                                      BAZ_TESTS + ['BazTest.DISABLED_TestC'])
+
+  def testFilterByTest(self):
+    """Tests filtering by test name."""
+
+    self.RunAndVerify('*.TestOne', ['BarTest.TestOne', 'BazTest.TestOne'])
+
+  def testFilterDisabledTests(self):
+    """Select only the disabled tests to run."""
+
+    self.RunAndVerify('DISABLED_FoobarTest.Test1', [])
+    self.RunAndVerifyAllowingDisabled('DISABLED_FoobarTest.Test1',
+                                      ['DISABLED_FoobarTest.Test1'])
+
+    self.RunAndVerify('*DISABLED_*', [])
+    self.RunAndVerifyAllowingDisabled('*DISABLED_*', DISABLED_TESTS)
+
+    self.RunAndVerify('*.DISABLED_*', [])
+    self.RunAndVerifyAllowingDisabled('*.DISABLED_*', [
+        'BarTest.DISABLED_TestFour',
+        'BarTest.DISABLED_TestFive',
+        'BazTest.DISABLED_TestC',
+        'DISABLED_FoobarTest.DISABLED_Test2',
+        ])
+
+    self.RunAndVerify('DISABLED_*', [])
+    self.RunAndVerifyAllowingDisabled('DISABLED_*', [
+        'DISABLED_FoobarTest.Test1',
+        'DISABLED_FoobarTest.DISABLED_Test2',
+        'DISABLED_FoobarbazTest.TestA',
+        ])
+
+  def testWildcardInTestCaseName(self):
+    """Tests using wildcard in the test case name."""
+
+    self.RunAndVerify('*a*.*', [
+        'BarTest.TestOne',
+        'BarTest.TestTwo',
+        'BarTest.TestThree',
+
+        'BazTest.TestOne',
+        'BazTest.TestA',
+        'BazTest.TestB',
+
+        'HasDeathTest.Test1',
+        'HasDeathTest.Test2', ] + PARAM_TESTS)
+
+  def testWildcardInTestName(self):
+    """Tests using wildcard in the test name."""
+
+    self.RunAndVerify('*.*A*', ['FooTest.Abc', 'BazTest.TestA'])
+
+  def testFilterWithoutDot(self):
+    """Tests a filter that has no '.' in it."""
+
+    self.RunAndVerify('*z*', [
+        'FooTest.Xyz',
+
+        'BazTest.TestOne',
+        'BazTest.TestA',
+        'BazTest.TestB',
+        ])
+
+  def testTwoPatterns(self):
+    """Tests filters that consist of two patterns."""
+
+    self.RunAndVerify('Foo*.*:*A*', [
+        'FooTest.Abc',
+        'FooTest.Xyz',
+
+        'BazTest.TestA',
+        ])
+
+    # An empty pattern + a non-empty one
+    self.RunAndVerify(':*A*', ['FooTest.Abc', 'BazTest.TestA'])
+
+  def testThreePatterns(self):
+    """Tests filters that consist of three patterns."""
+
+    self.RunAndVerify('*oo*:*A*:*One', [
+        'FooTest.Abc',
+        'FooTest.Xyz',
+
+        'BarTest.TestOne',
+
+        'BazTest.TestOne',
+        'BazTest.TestA',
+        ])
+
+    # The 2nd pattern is empty.
+    self.RunAndVerify('*oo*::*One', [
+        'FooTest.Abc',
+        'FooTest.Xyz',
+
+        'BarTest.TestOne',
+
+        'BazTest.TestOne',
+        ])
+
+    # The last 2 patterns are empty.
+    self.RunAndVerify('*oo*::', [
+        'FooTest.Abc',
+        'FooTest.Xyz',
+        ])
+
+  def testNegativeFilters(self):
+    self.RunAndVerify('*-HasDeathTest.Test1', [
+        'FooTest.Abc',
+        'FooTest.Xyz',
+
+        'BarTest.TestOne',
+        'BarTest.TestTwo',
+        'BarTest.TestThree',
+
+        'BazTest.TestOne',
+        'BazTest.TestA',
+        'BazTest.TestB',
+
+        'HasDeathTest.Test2',
+        ] + PARAM_TESTS)
+
+    self.RunAndVerify('*-FooTest.Abc:HasDeathTest.*', [
+        'FooTest.Xyz',
+
+        'BarTest.TestOne',
+        'BarTest.TestTwo',
+        'BarTest.TestThree',
+
+        'BazTest.TestOne',
+        'BazTest.TestA',
+        'BazTest.TestB',
+        ] + PARAM_TESTS)
+
+    self.RunAndVerify('BarTest.*-BarTest.TestOne', [
+        'BarTest.TestTwo',
+        'BarTest.TestThree',
+        ])
+
+    # Tests without leading '*'.
+    self.RunAndVerify('-FooTest.Abc:FooTest.Xyz:HasDeathTest.*', [
+        'BarTest.TestOne',
+        'BarTest.TestTwo',
+        'BarTest.TestThree',
+
+        'BazTest.TestOne',
+        'BazTest.TestA',
+        'BazTest.TestB',
+        ] + PARAM_TESTS)
+
+    # Value parameterized tests.
+    self.RunAndVerify('*/*', PARAM_TESTS)
+
+    # Value parameterized tests filtering by the sequence name.
+    self.RunAndVerify('SeqP/*', [
+        'SeqP/ParamTest.TestX/0',
+        'SeqP/ParamTest.TestX/1',
+        'SeqP/ParamTest.TestY/0',
+        'SeqP/ParamTest.TestY/1',
+        ])
+
+    # Value parameterized tests filtering by the test name.
+    self.RunAndVerify('*/0', [
+        'SeqP/ParamTest.TestX/0',
+        'SeqP/ParamTest.TestY/0',
+        'SeqQ/ParamTest.TestX/0',
+        'SeqQ/ParamTest.TestY/0',
+        ])
+
+  def testFlagOverridesEnvVar(self):
+    """Tests that the filter flag overrides the filtering env. variable."""
+
+    SetEnvVar(FILTER_ENV_VAR, 'Foo*')
+    args = ['--%s=%s' % (FILTER_FLAG, '*One')]
+    tests_run = RunAndExtractTestList(args)[0]
+    SetEnvVar(FILTER_ENV_VAR, None)
+
+    self.AssertSetEqual(tests_run, ['BarTest.TestOne', 'BazTest.TestOne'])
+
+  def testShardStatusFileIsCreated(self):
+    """Tests that the shard file is created if specified in the environment."""
+
+    shard_status_file = os.path.join(gtest_test_utils.GetTempDir(),
+                                     'shard_status_file')
+    self.assert_(not os.path.exists(shard_status_file))
+
+    extra_env = {SHARD_STATUS_FILE_ENV_VAR: shard_status_file}
+    try:
+      InvokeWithModifiedEnv(extra_env, RunAndReturnOutput)
+    finally:
+      self.assert_(os.path.exists(shard_status_file))
+      os.remove(shard_status_file)
+
+  def testShardStatusFileIsCreatedWithListTests(self):
+    """Tests that the shard file is created with --gtest_list_tests."""
+
+    shard_status_file = os.path.join(gtest_test_utils.GetTempDir(),
+                                     'shard_status_file2')
+    self.assert_(not os.path.exists(shard_status_file))
+
+    extra_env = {SHARD_STATUS_FILE_ENV_VAR: shard_status_file}
+    try:
+      InvokeWithModifiedEnv(extra_env,
+                            RunAndReturnOutput,
+                            ['--gtest_list_tests'])
+    finally:
+      self.assert_(os.path.exists(shard_status_file))
+      os.remove(shard_status_file)
+
+  def testShardingWorksWithDeathTests(self):
+    """Tests integration with death tests and sharding."""
+    gtest_filter = 'HasDeathTest.*:SeqP/*'
+    expected_tests = [
+        'HasDeathTest.Test1',
+        'HasDeathTest.Test2',
+
+        'SeqP/ParamTest.TestX/0',
+        'SeqP/ParamTest.TestX/1',
+        'SeqP/ParamTest.TestY/0',
+        'SeqP/ParamTest.TestY/1',
+        ]
+
+    for flag in ['--gtest_death_test_style=threadsafe',
+                 '--gtest_death_test_style=fast']:
+      self.RunAndVerifyWithSharding(gtest_filter, 3, expected_tests,
+                                    check_exit_0=True, args=[flag])
+      self.RunAndVerifyWithSharding(gtest_filter, 5, expected_tests,
+                                    check_exit_0=True, args=[flag])
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_help_test.py b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_help_test.py
index d97db646..91081ad3 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_help_test.py
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_help_test.py
@@ -1,126 +1,126 @@
-#!/usr/bin/env python

-#

-# Copyright 2009, Google Inc.

-# All rights reserved.

-#

-# Redistribution and use in source and binary forms, with or without

-# modification, are permitted provided that the following conditions are

-# met:

-#

-#     * Redistributions of source code must retain the above copyright

-# notice, this list of conditions and the following disclaimer.

-#     * Redistributions in binary form must reproduce the above

-# copyright notice, this list of conditions and the following disclaimer

-# in the documentation and/or other materials provided with the

-# distribution.

-#     * Neither the name of Google Inc. nor the names of its

-# contributors may be used to endorse or promote products derived from

-# this software without specific prior written permission.

-#

-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-"""Tests the --help flag of Google C++ Testing Framework.

-

-SYNOPSIS

-       gtest_help_test.py --gtest_build_dir=BUILD/DIR

-         # where BUILD/DIR contains the built gtest_help_test_ file.

-       gtest_help_test.py

-"""

-

-__author__ = '[email protected] (Zhanyong Wan)'

-

-import os

-import re

-import gtest_test_utils

-

-

-IS_WINDOWS = os.name == 'nt'

-

-PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath('gtest_help_test_')

-FLAG_PREFIX = '--gtest_'

-CATCH_EXCEPTIONS_FLAG = FLAG_PREFIX + 'catch_exceptions'

-DEATH_TEST_STYLE_FLAG = FLAG_PREFIX + 'death_test_style'

-

-# The help message must match this regex.

-HELP_REGEX = re.compile(

-    FLAG_PREFIX + r'list_tests.*' +

-    FLAG_PREFIX + r'filter=.*' +

-    FLAG_PREFIX + r'also_run_disabled_tests.*' +

-    FLAG_PREFIX + r'repeat=.*' +

-    FLAG_PREFIX + r'shuffle.*' +

-    FLAG_PREFIX + r'random_seed=.*' +

-    FLAG_PREFIX + r'color=.*' +

-    FLAG_PREFIX + r'print_time.*' +

-    FLAG_PREFIX + r'output=.*' +

-    FLAG_PREFIX + r'break_on_failure.*' +

-    FLAG_PREFIX + r'throw_on_failure.*',

-    re.DOTALL)

-

-

-def RunWithFlag(flag):

-  """Runs gtest_help_test_ with the given flag.

-

-  Returns:

-    the exit code and the text output as a tuple.

-  Args:

-    flag: the command-line flag to pass to gtest_help_test_, or None.

-  """

-

-  if flag is None:

-    command = [PROGRAM_PATH]

-  else:

-    command = [PROGRAM_PATH, flag]

-  child = gtest_test_utils.Subprocess(command)

-  return child.exit_code, child.output

-

-

-class GTestHelpTest(gtest_test_utils.TestCase):

-  """Tests the --help flag and its equivalent forms."""

-

-  def TestHelpFlag(self, flag):

-    """Verifies that the right message is printed and the tests are

-    skipped when the given flag is specified."""

-

-    exit_code, output = RunWithFlag(flag)

-    self.assertEquals(0, exit_code)

-    self.assert_(HELP_REGEX.search(output), output)

-    if IS_WINDOWS:

-      self.assert_(CATCH_EXCEPTIONS_FLAG in output, output)

-      self.assert_(DEATH_TEST_STYLE_FLAG not in output, output)

-    else:

-      self.assert_(CATCH_EXCEPTIONS_FLAG not in output, output)

-      self.assert_(DEATH_TEST_STYLE_FLAG in output, output)

-

-  def testPrintsHelpWithFullFlag(self):

-    self.TestHelpFlag('--help')

-

-  def testPrintsHelpWithShortFlag(self):

-    self.TestHelpFlag('-h')

-

-  def testPrintsHelpWithQuestionFlag(self):

-    self.TestHelpFlag('-?')

-

-  def testPrintsHelpWithWindowsStyleQuestionFlag(self):

-    self.TestHelpFlag('/?')

-

-  def testRunsTestsWithoutHelpFlag(self):

-    """Verifies that when no help flag is specified, the tests are run

-    and the help message is not printed."""

-

-    exit_code, output = RunWithFlag(None)

-    self.assert_(exit_code != 0)

-    self.assert_(not HELP_REGEX.search(output), output)

-

-

-if __name__ == '__main__':

-  gtest_test_utils.Main()

+#!/usr/bin/env python
+#
+# Copyright 2009, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Tests the --help flag of Google C++ Testing Framework.
+
+SYNOPSIS
+       gtest_help_test.py --gtest_build_dir=BUILD/DIR
+         # where BUILD/DIR contains the built gtest_help_test_ file.
+       gtest_help_test.py
+"""
+
+__author__ = '[email protected] (Zhanyong Wan)'
+
+import os
+import re
+import gtest_test_utils
+
+
+IS_WINDOWS = os.name == 'nt'
+
+PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath('gtest_help_test_')
+FLAG_PREFIX = '--gtest_'
+CATCH_EXCEPTIONS_FLAG = FLAG_PREFIX + 'catch_exceptions'
+DEATH_TEST_STYLE_FLAG = FLAG_PREFIX + 'death_test_style'
+
+# The help message must match this regex.
+HELP_REGEX = re.compile(
+    FLAG_PREFIX + r'list_tests.*' +
+    FLAG_PREFIX + r'filter=.*' +
+    FLAG_PREFIX + r'also_run_disabled_tests.*' +
+    FLAG_PREFIX + r'repeat=.*' +
+    FLAG_PREFIX + r'shuffle.*' +
+    FLAG_PREFIX + r'random_seed=.*' +
+    FLAG_PREFIX + r'color=.*' +
+    FLAG_PREFIX + r'print_time.*' +
+    FLAG_PREFIX + r'output=.*' +
+    FLAG_PREFIX + r'break_on_failure.*' +
+    FLAG_PREFIX + r'throw_on_failure.*',
+    re.DOTALL)
+
+
+def RunWithFlag(flag):
+  """Runs gtest_help_test_ with the given flag.
+
+  Returns:
+    the exit code and the text output as a tuple.
+  Args:
+    flag: the command-line flag to pass to gtest_help_test_, or None.
+  """
+
+  if flag is None:
+    command = [PROGRAM_PATH]
+  else:
+    command = [PROGRAM_PATH, flag]
+  child = gtest_test_utils.Subprocess(command)
+  return child.exit_code, child.output
+
+
+class GTestHelpTest(gtest_test_utils.TestCase):
+  """Tests the --help flag and its equivalent forms."""
+
+  def TestHelpFlag(self, flag):
+    """Verifies that the right message is printed and the tests are
+    skipped when the given flag is specified."""
+
+    exit_code, output = RunWithFlag(flag)
+    self.assertEquals(0, exit_code)
+    self.assert_(HELP_REGEX.search(output), output)
+    if IS_WINDOWS:
+      self.assert_(CATCH_EXCEPTIONS_FLAG in output, output)
+      self.assert_(DEATH_TEST_STYLE_FLAG not in output, output)
+    else:
+      self.assert_(CATCH_EXCEPTIONS_FLAG not in output, output)
+      self.assert_(DEATH_TEST_STYLE_FLAG in output, output)
+
+  def testPrintsHelpWithFullFlag(self):
+    self.TestHelpFlag('--help')
+
+  def testPrintsHelpWithShortFlag(self):
+    self.TestHelpFlag('-h')
+
+  def testPrintsHelpWithQuestionFlag(self):
+    self.TestHelpFlag('-?')
+
+  def testPrintsHelpWithWindowsStyleQuestionFlag(self):
+    self.TestHelpFlag('/?')
+
+  def testRunsTestsWithoutHelpFlag(self):
+    """Verifies that when no help flag is specified, the tests are run
+    and the help message is not printed."""
+
+    exit_code, output = RunWithFlag(None)
+    self.assert_(exit_code != 0)
+    self.assert_(not HELP_REGEX.search(output), output)
+
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_list_tests_unittest.py b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_list_tests_unittest.py
index 8a6c48f3..ce8c3ef0 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_list_tests_unittest.py
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_list_tests_unittest.py
@@ -1,177 +1,177 @@
-#!/usr/bin/env python

-#

-# Copyright 2006, Google Inc.

-# All rights reserved.

-#

-# Redistribution and use in source and binary forms, with or without

-# modification, are permitted provided that the following conditions are

-# met:

-#

-#     * Redistributions of source code must retain the above copyright

-# notice, this list of conditions and the following disclaimer.

-#     * Redistributions in binary form must reproduce the above

-# copyright notice, this list of conditions and the following disclaimer

-# in the documentation and/or other materials provided with the

-# distribution.

-#     * Neither the name of Google Inc. nor the names of its

-# contributors may be used to endorse or promote products derived from

-# this software without specific prior written permission.

-#

-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-"""Unit test for Google Test's --gtest_list_tests flag.

-

-A user can ask Google Test to list all tests by specifying the

---gtest_list_tests flag.  This script tests such functionality

-by invoking gtest_list_tests_unittest_ (a program written with

-Google Test) the command line flags.

-"""

-

-__author__ = '[email protected] (Patrick Hanna)'

-

-import gtest_test_utils

-

-

-# Constants.

-

-# The command line flag for enabling/disabling listing all tests.

-LIST_TESTS_FLAG = 'gtest_list_tests'

-

-# Path to the gtest_list_tests_unittest_ program.

-EXE_PATH = gtest_test_utils.GetTestExecutablePath('gtest_list_tests_unittest_')

-

-# The expected output when running gtest_list_tests_unittest_ with

-# --gtest_list_tests

-EXPECTED_OUTPUT_NO_FILTER = """FooDeathTest.

-  Test1

-Foo.

-  Bar1

-  Bar2

-  DISABLED_Bar3

-Abc.

-  Xyz

-  Def

-FooBar.

-  Baz

-FooTest.

-  Test1

-  DISABLED_Test2

-  Test3

-"""

-

-# The expected output when running gtest_list_tests_unittest_ with

-# --gtest_list_tests and --gtest_filter=Foo*.

-EXPECTED_OUTPUT_FILTER_FOO = """FooDeathTest.

-  Test1

-Foo.

-  Bar1

-  Bar2

-  DISABLED_Bar3

-FooBar.

-  Baz

-FooTest.

-  Test1

-  DISABLED_Test2

-  Test3

-"""

-

-# Utilities.

-

-

-def Run(args):

-  """Runs gtest_list_tests_unittest_ and returns the list of tests printed."""

-

-  return gtest_test_utils.Subprocess([EXE_PATH] + args,

-                                     capture_stderr=False).output

-

-

-# The unit test.

-

-class GTestListTestsUnitTest(gtest_test_utils.TestCase):

-  """Tests using the --gtest_list_tests flag to list all tests."""

-

-  def RunAndVerify(self, flag_value, expected_output, other_flag):

-    """Runs gtest_list_tests_unittest_ and verifies that it prints

-    the correct tests.

-

-    Args:

-      flag_value:       value of the --gtest_list_tests flag;

-                        None if the flag should not be present.

-

-      expected_output:  the expected output after running command;

-

-      other_flag:       a different flag to be passed to command

-                        along with gtest_list_tests;

-                        None if the flag should not be present.

-    """

-

-    if flag_value is None:

-      flag = ''

-      flag_expression = 'not set'

-    elif flag_value == '0':

-      flag = '--%s=0' % LIST_TESTS_FLAG

-      flag_expression = '0'

-    else:

-      flag = '--%s' % LIST_TESTS_FLAG

-      flag_expression = '1'

-

-    args = [flag]

-

-    if other_flag is not None:

-      args += [other_flag]

-

-    output = Run(args)

-

-    msg = ('when %s is %s, the output of "%s" is "%s".' %

-           (LIST_TESTS_FLAG, flag_expression, ' '.join(args), output))

-

-    if expected_output is not None:

-      self.assert_(output == expected_output, msg)

-    else:

-      self.assert_(output != EXPECTED_OUTPUT_NO_FILTER, msg)

-

-  def testDefaultBehavior(self):

-    """Tests the behavior of the default mode."""

-

-    self.RunAndVerify(flag_value=None,

-                      expected_output=None,

-                      other_flag=None)

-

-  def testFlag(self):

-    """Tests using the --gtest_list_tests flag."""

-

-    self.RunAndVerify(flag_value='0',

-                      expected_output=None,

-                      other_flag=None)

-    self.RunAndVerify(flag_value='1',

-                      expected_output=EXPECTED_OUTPUT_NO_FILTER,

-                      other_flag=None)

-

-  def testOverrideNonFilterFlags(self):

-    """Tests that --gtest_list_tests overrides the non-filter flags."""

-

-    self.RunAndVerify(flag_value='1',

-                      expected_output=EXPECTED_OUTPUT_NO_FILTER,

-                      other_flag='--gtest_break_on_failure')

-

-  def testWithFilterFlags(self):

-    """Tests that --gtest_list_tests takes into account the

-    --gtest_filter flag."""

-

-    self.RunAndVerify(flag_value='1',

-                      expected_output=EXPECTED_OUTPUT_FILTER_FOO,

-                      other_flag='--gtest_filter=Foo*')

-

-

-if __name__ == '__main__':

-  gtest_test_utils.Main()

+#!/usr/bin/env python
+#
+# Copyright 2006, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Unit test for Google Test's --gtest_list_tests flag.
+
+A user can ask Google Test to list all tests by specifying the
+--gtest_list_tests flag.  This script tests such functionality
+by invoking gtest_list_tests_unittest_ (a program written with
+Google Test) the command line flags.
+"""
+
+__author__ = '[email protected] (Patrick Hanna)'
+
+import gtest_test_utils
+
+
+# Constants.
+
+# The command line flag for enabling/disabling listing all tests.
+LIST_TESTS_FLAG = 'gtest_list_tests'
+
+# Path to the gtest_list_tests_unittest_ program.
+EXE_PATH = gtest_test_utils.GetTestExecutablePath('gtest_list_tests_unittest_')
+
+# The expected output when running gtest_list_tests_unittest_ with
+# --gtest_list_tests
+EXPECTED_OUTPUT_NO_FILTER = """FooDeathTest.
+  Test1
+Foo.
+  Bar1
+  Bar2
+  DISABLED_Bar3
+Abc.
+  Xyz
+  Def
+FooBar.
+  Baz
+FooTest.
+  Test1
+  DISABLED_Test2
+  Test3
+"""
+
+# The expected output when running gtest_list_tests_unittest_ with
+# --gtest_list_tests and --gtest_filter=Foo*.
+EXPECTED_OUTPUT_FILTER_FOO = """FooDeathTest.
+  Test1
+Foo.
+  Bar1
+  Bar2
+  DISABLED_Bar3
+FooBar.
+  Baz
+FooTest.
+  Test1
+  DISABLED_Test2
+  Test3
+"""
+
+# Utilities.
+
+
+def Run(args):
+  """Runs gtest_list_tests_unittest_ and returns the list of tests printed."""
+
+  return gtest_test_utils.Subprocess([EXE_PATH] + args,
+                                     capture_stderr=False).output
+
+
+# The unit test.
+
+class GTestListTestsUnitTest(gtest_test_utils.TestCase):
+  """Tests using the --gtest_list_tests flag to list all tests."""
+
+  def RunAndVerify(self, flag_value, expected_output, other_flag):
+    """Runs gtest_list_tests_unittest_ and verifies that it prints
+    the correct tests.
+
+    Args:
+      flag_value:       value of the --gtest_list_tests flag;
+                        None if the flag should not be present.
+
+      expected_output:  the expected output after running command;
+
+      other_flag:       a different flag to be passed to command
+                        along with gtest_list_tests;
+                        None if the flag should not be present.
+    """
+
+    if flag_value is None:
+      flag = ''
+      flag_expression = 'not set'
+    elif flag_value == '0':
+      flag = '--%s=0' % LIST_TESTS_FLAG
+      flag_expression = '0'
+    else:
+      flag = '--%s' % LIST_TESTS_FLAG
+      flag_expression = '1'
+
+    args = [flag]
+
+    if other_flag is not None:
+      args += [other_flag]
+
+    output = Run(args)
+
+    msg = ('when %s is %s, the output of "%s" is "%s".' %
+           (LIST_TESTS_FLAG, flag_expression, ' '.join(args), output))
+
+    if expected_output is not None:
+      self.assert_(output == expected_output, msg)
+    else:
+      self.assert_(output != EXPECTED_OUTPUT_NO_FILTER, msg)
+
+  def testDefaultBehavior(self):
+    """Tests the behavior of the default mode."""
+
+    self.RunAndVerify(flag_value=None,
+                      expected_output=None,
+                      other_flag=None)
+
+  def testFlag(self):
+    """Tests using the --gtest_list_tests flag."""
+
+    self.RunAndVerify(flag_value='0',
+                      expected_output=None,
+                      other_flag=None)
+    self.RunAndVerify(flag_value='1',
+                      expected_output=EXPECTED_OUTPUT_NO_FILTER,
+                      other_flag=None)
+
+  def testOverrideNonFilterFlags(self):
+    """Tests that --gtest_list_tests overrides the non-filter flags."""
+
+    self.RunAndVerify(flag_value='1',
+                      expected_output=EXPECTED_OUTPUT_NO_FILTER,
+                      other_flag='--gtest_break_on_failure')
+
+  def testWithFilterFlags(self):
+    """Tests that --gtest_list_tests takes into account the
+    --gtest_filter flag."""
+
+    self.RunAndVerify(flag_value='1',
+                      expected_output=EXPECTED_OUTPUT_FILTER_FOO,
+                      other_flag='--gtest_filter=Foo*')
+
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_nc_test.py b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_nc_test.py
index 389cb376..06ffb3f8 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_nc_test.py
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_nc_test.py
@@ -1,106 +1,106 @@
-#!/usr/bin/env python

-#

-# Copyright 2007, Google Inc.

-# All rights reserved.

-#

-# Redistribution and use in source and binary forms, with or without

-# modification, are permitted provided that the following conditions are

-# met:

-#

-#     * Redistributions of source code must retain the above copyright

-# notice, this list of conditions and the following disclaimer.

-#     * Redistributions in binary form must reproduce the above

-# copyright notice, this list of conditions and the following disclaimer

-# in the documentation and/or other materials provided with the

-# distribution.

-#     * Neither the name of Google Inc. nor the names of its

-# contributors may be used to endorse or promote products derived from

-# this software without specific prior written permission.

-#

-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-"""Negative compilation test for Google Test."""

-

-__author__ = '[email protected] (Zhanyong Wan)'

-

-import os

-import sys

-import unittest

-

-

-IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'

-if not IS_LINUX:

-  sys.exit(0)  # Negative compilation tests are not supported on Windows & Mac.

-

-

-class GTestNCTest(unittest.TestCase):

-  """Negative compilation test for Google Test."""

-

-  def testCompilerError(self):

-    """Verifies that erroneous code leads to expected compiler

-    messages."""

-

-    # Defines a list of test specs, where each element is a tuple

-    # (test name, list of regexes for matching the compiler errors).

-    test_specs = [

-      ('CANNOT_IGNORE_RUN_ALL_TESTS_RESULT',

-       [r'ignoring return value']),

-

-      ('USER_CANNOT_INCLUDE_GTEST_INTERNAL_INL_H',

-       [r'must not be included except by Google Test itself']),

-

-      ('CATCHES_DECLARING_SETUP_IN_TEST_FIXTURE_WITH_TYPO',

-       [r'Setup_should_be_spelled_SetUp']),

-

-      ('CATCHES_CALLING_SETUP_IN_TEST_WITH_TYPO',

-       [r'Setup_should_be_spelled_SetUp']),

-

-      ('CATCHES_DECLARING_SETUP_IN_ENVIRONMENT_WITH_TYPO',

-       [r'Setup_should_be_spelled_SetUp']),

-

-      ('CATCHES_CALLING_SETUP_IN_ENVIRONMENT_WITH_TYPO',

-       [r'Setup_should_be_spelled_SetUp']),

-

-      ('CATCHES_WRONG_CASE_IN_TYPED_TEST_P',

-       [r'BarTest.*was not declared']),

-

-      ('CATCHES_WRONG_CASE_IN_REGISTER_TYPED_TEST_CASE_P',

-       [r'BarTest.*was not declared']),

-

-      ('CATCHES_WRONG_CASE_IN_INSTANTIATE_TYPED_TEST_CASE_P',

-       [r'BarTest.*not declared']),

-

-      ('CATCHES_INSTANTIATE_TYPED_TESET_CASE_P_WITH_SAME_NAME_PREFIX',

-       [r'redefinition of.*My.*FooTest']),

-

-      ('STATIC_ASSERT_TYPE_EQ_IS_NOT_A_TYPE',

-       [r'StaticAssertTypeEq.* does not name a type']),

-

-      ('STATIC_ASSERT_TYPE_EQ_WORKS_IN_NAMESPACE',

-       [r'StaticAssertTypeEq.*int.*const int']),

-

-      ('STATIC_ASSERT_TYPE_EQ_WORKS_IN_CLASS',

-       [r'StaticAssertTypeEq.*int.*bool']),

-

-      ('STATIC_ASSERT_TYPE_EQ_WORKS_IN_FUNCTION',

-       [r'StaticAssertTypeEq.*const int.*int']),

-

-      ('SANITY',

-       None)

-      ]

-

-    # TODO([email protected]): verify that the test specs are satisfied.

-

-

-if __name__ == '__main__':

-  unittest.main()

+#!/usr/bin/env python
+#
+# Copyright 2007, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Negative compilation test for Google Test."""
+
+__author__ = '[email protected] (Zhanyong Wan)'
+
+import os
+import sys
+import unittest
+
+
+IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
+if not IS_LINUX:
+  sys.exit(0)  # Negative compilation tests are not supported on Windows & Mac.
+
+
+class GTestNCTest(unittest.TestCase):
+  """Negative compilation test for Google Test."""
+
+  def testCompilerError(self):
+    """Verifies that erroneous code leads to expected compiler
+    messages."""
+
+    # Defines a list of test specs, where each element is a tuple
+    # (test name, list of regexes for matching the compiler errors).
+    test_specs = [
+      ('CANNOT_IGNORE_RUN_ALL_TESTS_RESULT',
+       [r'ignoring return value']),
+
+      ('USER_CANNOT_INCLUDE_GTEST_INTERNAL_INL_H',
+       [r'must not be included except by Google Test itself']),
+
+      ('CATCHES_DECLARING_SETUP_IN_TEST_FIXTURE_WITH_TYPO',
+       [r'Setup_should_be_spelled_SetUp']),
+
+      ('CATCHES_CALLING_SETUP_IN_TEST_WITH_TYPO',
+       [r'Setup_should_be_spelled_SetUp']),
+
+      ('CATCHES_DECLARING_SETUP_IN_ENVIRONMENT_WITH_TYPO',
+       [r'Setup_should_be_spelled_SetUp']),
+
+      ('CATCHES_CALLING_SETUP_IN_ENVIRONMENT_WITH_TYPO',
+       [r'Setup_should_be_spelled_SetUp']),
+
+      ('CATCHES_WRONG_CASE_IN_TYPED_TEST_P',
+       [r'BarTest.*was not declared']),
+
+      ('CATCHES_WRONG_CASE_IN_REGISTER_TYPED_TEST_CASE_P',
+       [r'BarTest.*was not declared']),
+
+      ('CATCHES_WRONG_CASE_IN_INSTANTIATE_TYPED_TEST_CASE_P',
+       [r'BarTest.*not declared']),
+
+      ('CATCHES_INSTANTIATE_TYPED_TESET_CASE_P_WITH_SAME_NAME_PREFIX',
+       [r'redefinition of.*My.*FooTest']),
+
+      ('STATIC_ASSERT_TYPE_EQ_IS_NOT_A_TYPE',
+       [r'StaticAssertTypeEq.* does not name a type']),
+
+      ('STATIC_ASSERT_TYPE_EQ_WORKS_IN_NAMESPACE',
+       [r'StaticAssertTypeEq.*int.*const int']),
+
+      ('STATIC_ASSERT_TYPE_EQ_WORKS_IN_CLASS',
+       [r'StaticAssertTypeEq.*int.*bool']),
+
+      ('STATIC_ASSERT_TYPE_EQ_WORKS_IN_FUNCTION',
+       [r'StaticAssertTypeEq.*const int.*int']),
+
+      ('SANITY',
+       None)
+      ]
+
+    # TODO([email protected]): verify that the test specs are satisfied.
+
+
+if __name__ == '__main__':
+  unittest.main()
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test.py b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test.py
index 07aeed91..c8a38f53 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test.py
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test.py
@@ -1,307 +1,307 @@
-#!/usr/bin/env python

-#

-# Copyright 2008, Google Inc.

-# All rights reserved.

-#

-# Redistribution and use in source and binary forms, with or without

-# modification, are permitted provided that the following conditions are

-# met:

-#

-#     * Redistributions of source code must retain the above copyright

-# notice, this list of conditions and the following disclaimer.

-#     * Redistributions in binary form must reproduce the above

-# copyright notice, this list of conditions and the following disclaimer

-# in the documentation and/or other materials provided with the

-# distribution.

-#     * Neither the name of Google Inc. nor the names of its

-# contributors may be used to endorse or promote products derived from

-# this software without specific prior written permission.

-#

-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-"""Tests the text output of Google C++ Testing Framework.

-

-SYNOPSIS

-       gtest_output_test.py --gtest_build_dir=BUILD/DIR --gengolden

-         # where BUILD/DIR contains the built gtest_output_test_ file.

-       gtest_output_test.py --gengolden

-       gtest_output_test.py

-"""

-

-__author__ = '[email protected] (Zhanyong Wan)'

-

-import os

-import re

-import sys

-import gtest_test_utils

-

-

-# The flag for generating the golden file

-GENGOLDEN_FLAG = '--gengolden'

-

-IS_WINDOWS = os.name == 'nt'

-

-if IS_WINDOWS:

-  GOLDEN_NAME = 'gtest_output_test_golden_win.txt'

-else:

-  GOLDEN_NAME = 'gtest_output_test_golden_lin.txt'

-

-PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath('gtest_output_test_')

-

-# At least one command we exercise must not have the

-# --gtest_internal_skip_environment_and_ad_hoc_tests flag.

-COMMAND_LIST_TESTS = ({}, [PROGRAM_PATH, '--gtest_list_tests'])

-COMMAND_WITH_COLOR = ({}, [PROGRAM_PATH, '--gtest_color=yes'])

-COMMAND_WITH_TIME = ({}, [PROGRAM_PATH,

-                          '--gtest_print_time',

-                          '--gtest_internal_skip_environment_and_ad_hoc_tests',

-                          '--gtest_filter=FatalFailureTest.*:LoggingTest.*'])

-COMMAND_WITH_DISABLED = (

-    {}, [PROGRAM_PATH,

-         '--gtest_also_run_disabled_tests',

-         '--gtest_internal_skip_environment_and_ad_hoc_tests',

-         '--gtest_filter=*DISABLED_*'])

-COMMAND_WITH_SHARDING = (

-    {'GTEST_SHARD_INDEX': '1', 'GTEST_TOTAL_SHARDS': '2'},

-    [PROGRAM_PATH,

-     '--gtest_internal_skip_environment_and_ad_hoc_tests',

-     '--gtest_filter=PassingTest.*'])

-

-GOLDEN_PATH = os.path.join(gtest_test_utils.GetSourceDir(), GOLDEN_NAME)

-

-

-def ToUnixLineEnding(s):

-  """Changes all Windows/Mac line endings in s to UNIX line endings."""

-

-  return s.replace('\r\n', '\n').replace('\r', '\n')

-

-

-def RemoveLocations(test_output):

-  """Removes all file location info from a Google Test program's output.

-

-  Args:

-       test_output:  the output of a Google Test program.

-

-  Returns:

-       output with all file location info (in the form of

-       'DIRECTORY/FILE_NAME:LINE_NUMBER: 'or

-       'DIRECTORY\\FILE_NAME(LINE_NUMBER): ') replaced by

-       'FILE_NAME:#: '.

-  """

-

-  return re.sub(r'.*[/\\](.+)(\:\d+|\(\d+\))\: ', r'\1:#: ', test_output)

-

-

-def RemoveStackTraceDetails(output):

-  """Removes all stack traces from a Google Test program's output."""

-

-  # *? means "find the shortest string that matches".

-  return re.sub(r'Stack trace:(.|\n)*?\n\n',

-                'Stack trace: (omitted)\n\n', output)

-

-

-def RemoveStackTraces(output):

-  """Removes all traces of stack traces from a Google Test program's output."""

-

-  # *? means "find the shortest string that matches".

-  return re.sub(r'Stack trace:(.|\n)*?\n\n', '', output)

-

-

-def RemoveTime(output):

-  """Removes all time information from a Google Test program's output."""

-

-  return re.sub(r'\(\d+ ms', '(? ms', output)

-

-

-def RemoveTestCounts(output):

-  """Removes test counts from a Google Test program's output."""

-

-  output = re.sub(r'\d+ tests, listed below',

-                  '? tests, listed below', output)

-  output = re.sub(r'\d+ FAILED TESTS',

-                  '? FAILED TESTS', output)

-  output = re.sub(r'\d+ tests from \d+ test cases',

-                  '? tests from ? test cases', output)

-  output = re.sub(r'\d+ tests from ([a-zA-Z_])',

-                  r'? tests from \1', output)

-  return re.sub(r'\d+ tests\.', '? tests.', output)

-

-

-def RemoveMatchingTests(test_output, pattern):

-  """Removes output of specified tests from a Google Test program's output.

-

-  This function strips not only the beginning and the end of a test but also

-  all output in between.

-

-  Args:

-    test_output:       A string containing the test output.

-    pattern:           A regex string that matches names of test cases or

-                       tests to remove.

-

-  Returns:

-    Contents of test_output with tests whose names match pattern removed.

-  """

-

-  test_output = re.sub(

-      r'.*\[ RUN      \] .*%s(.|\n)*?\[(  FAILED  |       OK )\] .*%s.*\n' % (

-          pattern, pattern),

-      '',

-      test_output)

-  return re.sub(r'.*%s.*\n' % pattern, '', test_output)

-

-

-def NormalizeOutput(output):

-  """Normalizes output (the output of gtest_output_test_.exe)."""

-

-  output = ToUnixLineEnding(output)

-  output = RemoveLocations(output)

-  output = RemoveStackTraceDetails(output)

-  output = RemoveTime(output)

-  return output

-

-

-def GetShellCommandOutput(env_cmd):

-  """Runs a command in a sub-process, and returns its output in a string.

-

-  Args:

-    env_cmd: The shell command. A 2-tuple where element 0 is a dict of extra

-             environment variables to set, and element 1 is a string with

-             the command and any flags.

-

-  Returns:

-    A string with the command's combined standard and diagnostic output.

-  """

-

-  # Spawns cmd in a sub-process, and gets its standard I/O file objects.

-  # Set and save the environment properly.

-  old_env_vars = dict(os.environ)

-  os.environ.update(env_cmd[0])

-  p = gtest_test_utils.Subprocess(env_cmd[1])

-

-  # Changes made by os.environ.clear are not inheritable by child processes

-  # until Python 2.6. To produce inheritable changes we have to delete

-  # environment items with the del statement.

-  for key in os.environ.keys():

-    del os.environ[key]

-  os.environ.update(old_env_vars)

-

-  return p.output

-

-

-def GetCommandOutput(env_cmd):

-  """Runs a command and returns its output with all file location

-  info stripped off.

-

-  Args:

-    env_cmd:  The shell command. A 2-tuple where element 0 is a dict of extra

-              environment variables to set, and element 1 is a string with

-              the command and any flags.

-  """

-

-  # Disables exception pop-ups on Windows.

-  os.environ['GTEST_CATCH_EXCEPTIONS'] = '1'

-  return NormalizeOutput(GetShellCommandOutput(env_cmd))

-

-

-def GetOutputOfAllCommands():

-  """Returns concatenated output from several representative commands."""

-

-  return (GetCommandOutput(COMMAND_WITH_COLOR) +

-          GetCommandOutput(COMMAND_WITH_TIME) +

-          GetCommandOutput(COMMAND_WITH_DISABLED) +

-          GetCommandOutput(COMMAND_WITH_SHARDING))

-

-

-test_list = GetShellCommandOutput(COMMAND_LIST_TESTS)

-SUPPORTS_DEATH_TESTS = 'DeathTest' in test_list

-SUPPORTS_TYPED_TESTS = 'TypedTest' in test_list

-SUPPORTS_THREADS = 'ExpectFailureWithThreadsTest' in test_list

-SUPPORTS_STACK_TRACES = False

-

-CAN_GENERATE_GOLDEN_FILE = SUPPORTS_DEATH_TESTS and SUPPORTS_TYPED_TESTS

-

-

-class GTestOutputTest(gtest_test_utils.TestCase):

-  def RemoveUnsupportedTests(self, test_output):

-    if not SUPPORTS_DEATH_TESTS:

-      test_output = RemoveMatchingTests(test_output, 'DeathTest')

-    if not SUPPORTS_TYPED_TESTS:

-      test_output = RemoveMatchingTests(test_output, 'TypedTest')

-    if not SUPPORTS_THREADS:

-      test_output = RemoveMatchingTests(test_output,

-                                        'ExpectFailureWithThreadsTest')

-      test_output = RemoveMatchingTests(test_output,

-                                        'ScopedFakeTestPartResultReporterTest')

-      test_output = RemoveMatchingTests(test_output,

-                                        'WorksConcurrently')

-    if not SUPPORTS_STACK_TRACES:

-      test_output = RemoveStackTraces(test_output)

-

-    return test_output

-

-  def testOutput(self):

-    output = GetOutputOfAllCommands()

-

-    golden_file = open(GOLDEN_PATH, 'rb')

-    # A mis-configured source control system can cause \r appear in EOL

-    # sequences when we read the golden file irrespective of an operating

-    # system used. Therefore, we need to strip those \r's from newlines

-    # unconditionally.

-    golden = ToUnixLineEnding(golden_file.read())

-    golden_file.close()

-

-    # We want the test to pass regardless of certain features being

-    # supported or not.

-    if CAN_GENERATE_GOLDEN_FILE:

-      self.assert_(golden == output)

-    else:

-      normalized_actual = RemoveTestCounts(output)

-      normalized_golden = RemoveTestCounts(self.RemoveUnsupportedTests(golden))

-

-      # This code is very handy when debugging test differences so I left it

-      # here, commented.

-      # open(os.path.join(

-      #     gtest_test_utils.GetSourceDir(),

-      #     '_gtest_output_test_normalized_actual.txt'), 'wb').write(

-      #         normalized_actual)

-      # open(os.path.join(

-      #     gtest_test_utils.GetSourceDir(),

-      #     '_gtest_output_test_normalized_golden.txt'), 'wb').write(

-      #         normalized_golden)

-

-      self.assert_(normalized_golden == normalized_actual)

-

-

-if __name__ == '__main__':

-  if sys.argv[1:] == [GENGOLDEN_FLAG]:

-    if CAN_GENERATE_GOLDEN_FILE:

-      output = GetOutputOfAllCommands()

-      golden_file = open(GOLDEN_PATH, 'wb')

-      golden_file.write(output)

-      golden_file.close()

-    else:

-      message = (

-          """Unable to write a golden file when compiled in an environment

-that does not support all the required features (death tests""")

-      if IS_WINDOWS:

-        message += (

-            """\nand typed tests). Please check that you are using VC++ 8.0 SP1

-or higher as your compiler.""")

-      else:

-        message += """\nand typed tests).  Please generate the golden file

-using a binary built with those features enabled."""

-

-      sys.stderr.write(message)

-      sys.exit(1)

-  else:

-    gtest_test_utils.Main()

+#!/usr/bin/env python
+#
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Tests the text output of Google C++ Testing Framework.
+
+SYNOPSIS
+       gtest_output_test.py --gtest_build_dir=BUILD/DIR --gengolden
+         # where BUILD/DIR contains the built gtest_output_test_ file.
+       gtest_output_test.py --gengolden
+       gtest_output_test.py
+"""
+
+__author__ = '[email protected] (Zhanyong Wan)'
+
+import os
+import re
+import sys
+import gtest_test_utils
+
+
+# The flag for generating the golden file
+GENGOLDEN_FLAG = '--gengolden'
+
+IS_WINDOWS = os.name == 'nt'
+
+if IS_WINDOWS:
+  GOLDEN_NAME = 'gtest_output_test_golden_win.txt'
+else:
+  GOLDEN_NAME = 'gtest_output_test_golden_lin.txt'
+
+PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath('gtest_output_test_')
+
+# At least one command we exercise must not have the
+# --gtest_internal_skip_environment_and_ad_hoc_tests flag.
+COMMAND_LIST_TESTS = ({}, [PROGRAM_PATH, '--gtest_list_tests'])
+COMMAND_WITH_COLOR = ({}, [PROGRAM_PATH, '--gtest_color=yes'])
+COMMAND_WITH_TIME = ({}, [PROGRAM_PATH,
+                          '--gtest_print_time',
+                          '--gtest_internal_skip_environment_and_ad_hoc_tests',
+                          '--gtest_filter=FatalFailureTest.*:LoggingTest.*'])
+COMMAND_WITH_DISABLED = (
+    {}, [PROGRAM_PATH,
+         '--gtest_also_run_disabled_tests',
+         '--gtest_internal_skip_environment_and_ad_hoc_tests',
+         '--gtest_filter=*DISABLED_*'])
+COMMAND_WITH_SHARDING = (
+    {'GTEST_SHARD_INDEX': '1', 'GTEST_TOTAL_SHARDS': '2'},
+    [PROGRAM_PATH,
+     '--gtest_internal_skip_environment_and_ad_hoc_tests',
+     '--gtest_filter=PassingTest.*'])
+
+GOLDEN_PATH = os.path.join(gtest_test_utils.GetSourceDir(), GOLDEN_NAME)
+
+
+def ToUnixLineEnding(s):
+  """Changes all Windows/Mac line endings in s to UNIX line endings."""
+
+  return s.replace('\r\n', '\n').replace('\r', '\n')
+
+
+def RemoveLocations(test_output):
+  """Removes all file location info from a Google Test program's output.
+
+  Args:
+       test_output:  the output of a Google Test program.
+
+  Returns:
+       output with all file location info (in the form of
+       'DIRECTORY/FILE_NAME:LINE_NUMBER: 'or
+       'DIRECTORY\\FILE_NAME(LINE_NUMBER): ') replaced by
+       'FILE_NAME:#: '.
+  """
+
+  return re.sub(r'.*[/\\](.+)(\:\d+|\(\d+\))\: ', r'\1:#: ', test_output)
+
+
+def RemoveStackTraceDetails(output):
+  """Removes all stack traces from a Google Test program's output."""
+
+  # *? means "find the shortest string that matches".
+  return re.sub(r'Stack trace:(.|\n)*?\n\n',
+                'Stack trace: (omitted)\n\n', output)
+
+
+def RemoveStackTraces(output):
+  """Removes all traces of stack traces from a Google Test program's output."""
+
+  # *? means "find the shortest string that matches".
+  return re.sub(r'Stack trace:(.|\n)*?\n\n', '', output)
+
+
+def RemoveTime(output):
+  """Removes all time information from a Google Test program's output."""
+
+  return re.sub(r'\(\d+ ms', '(? ms', output)
+
+
+def RemoveTestCounts(output):
+  """Removes test counts from a Google Test program's output."""
+
+  output = re.sub(r'\d+ tests, listed below',
+                  '? tests, listed below', output)
+  output = re.sub(r'\d+ FAILED TESTS',
+                  '? FAILED TESTS', output)
+  output = re.sub(r'\d+ tests from \d+ test cases',
+                  '? tests from ? test cases', output)
+  output = re.sub(r'\d+ tests from ([a-zA-Z_])',
+                  r'? tests from \1', output)
+  return re.sub(r'\d+ tests\.', '? tests.', output)
+
+
+def RemoveMatchingTests(test_output, pattern):
+  """Removes output of specified tests from a Google Test program's output.
+
+  This function strips not only the beginning and the end of a test but also
+  all output in between.
+
+  Args:
+    test_output:       A string containing the test output.
+    pattern:           A regex string that matches names of test cases or
+                       tests to remove.
+
+  Returns:
+    Contents of test_output with tests whose names match pattern removed.
+  """
+
+  test_output = re.sub(
+      r'.*\[ RUN      \] .*%s(.|\n)*?\[(  FAILED  |       OK )\] .*%s.*\n' % (
+          pattern, pattern),
+      '',
+      test_output)
+  return re.sub(r'.*%s.*\n' % pattern, '', test_output)
+
+
+def NormalizeOutput(output):
+  """Normalizes output (the output of gtest_output_test_.exe)."""
+
+  output = ToUnixLineEnding(output)
+  output = RemoveLocations(output)
+  output = RemoveStackTraceDetails(output)
+  output = RemoveTime(output)
+  return output
+
+
+def GetShellCommandOutput(env_cmd):
+  """Runs a command in a sub-process, and returns its output in a string.
+
+  Args:
+    env_cmd: The shell command. A 2-tuple where element 0 is a dict of extra
+             environment variables to set, and element 1 is a string with
+             the command and any flags.
+
+  Returns:
+    A string with the command's combined standard and diagnostic output.
+  """
+
+  # Spawns cmd in a sub-process, and gets its standard I/O file objects.
+  # Set and save the environment properly.
+  old_env_vars = dict(os.environ)
+  os.environ.update(env_cmd[0])
+  p = gtest_test_utils.Subprocess(env_cmd[1])
+
+  # Changes made by os.environ.clear are not inheritable by child processes
+  # until Python 2.6. To produce inheritable changes we have to delete
+  # environment items with the del statement.
+  for key in os.environ.keys():
+    del os.environ[key]
+  os.environ.update(old_env_vars)
+
+  return p.output
+
+
+def GetCommandOutput(env_cmd):
+  """Runs a command and returns its output with all file location
+  info stripped off.
+
+  Args:
+    env_cmd:  The shell command. A 2-tuple where element 0 is a dict of extra
+              environment variables to set, and element 1 is a string with
+              the command and any flags.
+  """
+
+  # Disables exception pop-ups on Windows.
+  os.environ['GTEST_CATCH_EXCEPTIONS'] = '1'
+  return NormalizeOutput(GetShellCommandOutput(env_cmd))
+
+
+def GetOutputOfAllCommands():
+  """Returns concatenated output from several representative commands."""
+
+  return (GetCommandOutput(COMMAND_WITH_COLOR) +
+          GetCommandOutput(COMMAND_WITH_TIME) +
+          GetCommandOutput(COMMAND_WITH_DISABLED) +
+          GetCommandOutput(COMMAND_WITH_SHARDING))
+
+
+test_list = GetShellCommandOutput(COMMAND_LIST_TESTS)
+SUPPORTS_DEATH_TESTS = 'DeathTest' in test_list
+SUPPORTS_TYPED_TESTS = 'TypedTest' in test_list
+SUPPORTS_THREADS = 'ExpectFailureWithThreadsTest' in test_list
+SUPPORTS_STACK_TRACES = False
+
+CAN_GENERATE_GOLDEN_FILE = SUPPORTS_DEATH_TESTS and SUPPORTS_TYPED_TESTS
+
+
+class GTestOutputTest(gtest_test_utils.TestCase):
+  def RemoveUnsupportedTests(self, test_output):
+    if not SUPPORTS_DEATH_TESTS:
+      test_output = RemoveMatchingTests(test_output, 'DeathTest')
+    if not SUPPORTS_TYPED_TESTS:
+      test_output = RemoveMatchingTests(test_output, 'TypedTest')
+    if not SUPPORTS_THREADS:
+      test_output = RemoveMatchingTests(test_output,
+                                        'ExpectFailureWithThreadsTest')
+      test_output = RemoveMatchingTests(test_output,
+                                        'ScopedFakeTestPartResultReporterTest')
+      test_output = RemoveMatchingTests(test_output,
+                                        'WorksConcurrently')
+    if not SUPPORTS_STACK_TRACES:
+      test_output = RemoveStackTraces(test_output)
+
+    return test_output
+
+  def testOutput(self):
+    output = GetOutputOfAllCommands()
+
+    golden_file = open(GOLDEN_PATH, 'rb')
+    # A mis-configured source control system can cause \r appear in EOL
+    # sequences when we read the golden file irrespective of an operating
+    # system used. Therefore, we need to strip those \r's from newlines
+    # unconditionally.
+    golden = ToUnixLineEnding(golden_file.read())
+    golden_file.close()
+
+    # We want the test to pass regardless of certain features being
+    # supported or not.
+    if CAN_GENERATE_GOLDEN_FILE:
+      self.assert_(golden == output)
+    else:
+      normalized_actual = RemoveTestCounts(output)
+      normalized_golden = RemoveTestCounts(self.RemoveUnsupportedTests(golden))
+
+      # This code is very handy when debugging test differences so I left it
+      # here, commented.
+      # open(os.path.join(
+      #     gtest_test_utils.GetSourceDir(),
+      #     '_gtest_output_test_normalized_actual.txt'), 'wb').write(
+      #         normalized_actual)
+      # open(os.path.join(
+      #     gtest_test_utils.GetSourceDir(),
+      #     '_gtest_output_test_normalized_golden.txt'), 'wb').write(
+      #         normalized_golden)
+
+      self.assert_(normalized_golden == normalized_actual)
+
+
+if __name__ == '__main__':
+  if sys.argv[1:] == [GENGOLDEN_FLAG]:
+    if CAN_GENERATE_GOLDEN_FILE:
+      output = GetOutputOfAllCommands()
+      golden_file = open(GOLDEN_PATH, 'wb')
+      golden_file.write(output)
+      golden_file.close()
+    else:
+      message = (
+          """Unable to write a golden file when compiled in an environment
+that does not support all the required features (death tests""")
+      if IS_WINDOWS:
+        message += (
+            """\nand typed tests). Please check that you are using VC++ 8.0 SP1
+or higher as your compiler.""")
+      else:
+        message += """\nand typed tests).  Please generate the golden file
+using a binary built with those features enabled."""
+
+      sys.stderr.write(message)
+      sys.exit(1)
+  else:
+    gtest_test_utils.Main()
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_shuffle_test.py b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_shuffle_test.py
index ae2dc723..a870a01b 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_shuffle_test.py
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_shuffle_test.py
@@ -1,331 +1,331 @@
-#!/usr/bin/env python

-#

-# Copyright 2009 Google Inc. All Rights Reserved.

-#

-# Redistribution and use in source and binary forms, with or without

-# modification, are permitted provided that the following conditions are

-# met:

-#

-#     * Redistributions of source code must retain the above copyright

-# notice, this list of conditions and the following disclaimer.

-#     * Redistributions in binary form must reproduce the above

-# copyright notice, this list of conditions and the following disclaimer

-# in the documentation and/or other materials provided with the

-# distribution.

-#     * Neither the name of Google Inc. nor the names of its

-# contributors may be used to endorse or promote products derived from

-# this software without specific prior written permission.

-#

-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-"""Verifies that test shuffling works."""

-

-__author__ = '[email protected] (Zhanyong Wan)'

-

-import os

-import gtest_test_utils

-

-# Command to run the gtest_shuffle_test_ program.

-COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_shuffle_test_')

-

-# The environment variables for test sharding.

-TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS'

-SHARD_INDEX_ENV_VAR = 'GTEST_SHARD_INDEX'

-

-TEST_FILTER = 'A*.A:A*.B:C*'

-

-ALL_TESTS = []

-ACTIVE_TESTS = []

-FILTERED_TESTS = []

-SHARDED_TESTS = []

-

-SHUFFLED_ALL_TESTS = []

-SHUFFLED_ACTIVE_TESTS = []

-SHUFFLED_FILTERED_TESTS = []

-SHUFFLED_SHARDED_TESTS = []

-

-

-def AlsoRunDisabledTestsFlag():

-  return '--gtest_also_run_disabled_tests'

-

-

-def FilterFlag(test_filter):

-  return '--gtest_filter=%s' % (test_filter,)

-

-

-def RepeatFlag(n):

-  return '--gtest_repeat=%s' % (n,)

-

-

-def ShuffleFlag():

-  return '--gtest_shuffle'

-

-

-def RandomSeedFlag(n):

-  return '--gtest_random_seed=%s' % (n,)

-

-

-def RunAndReturnOutput(extra_env, args):

-  """Runs the test program and returns its output."""

-

-  try:

-    original_env = os.environ.copy()

-    os.environ.update(extra_env)

-    return gtest_test_utils.Subprocess([COMMAND] + args).output

-  finally:

-    for key in extra_env.iterkeys():

-      if key in original_env:

-        os.environ[key] = original_env[key]

-      else:

-        del os.environ[key]

-

-

-def GetTestsForAllIterations(extra_env, args):

-  """Runs the test program and returns a list of test lists.

-

-  Args:

-    extra_env: a map from environment variables to their values

-    args: command line flags to pass to gtest_shuffle_test_

-

-  Returns:

-    A list where the i-th element is the list of tests run in the i-th

-    test iteration.

-  """

-

-  test_iterations = []

-  for line in RunAndReturnOutput(extra_env, args).split('\n'):

-    if line.startswith('----'):

-      tests = []

-      test_iterations.append(tests)

-    elif line.strip():

-      tests.append(line.strip())  # 'TestCaseName.TestName'

-

-  return test_iterations

-

-

-def GetTestCases(tests):

-  """Returns a list of test cases in the given full test names.

-

-  Args:

-    tests: a list of full test names

-

-  Returns:

-    A list of test cases from 'tests', in their original order.

-    Consecutive duplicates are removed.

-  """

-

-  test_cases = []

-  for test in tests:

-    test_case = test.split('.')[0]

-    if not test_case in test_cases:

-      test_cases.append(test_case)

-

-  return test_cases

-

-

-def CalculateTestLists():

-  """Calculates the list of tests run under different flags."""

-

-  if not ALL_TESTS:

-    ALL_TESTS.extend(

-        GetTestsForAllIterations({}, [AlsoRunDisabledTestsFlag()])[0])

-

-  if not ACTIVE_TESTS:

-    ACTIVE_TESTS.extend(GetTestsForAllIterations({}, [])[0])

-

-  if not FILTERED_TESTS:

-    FILTERED_TESTS.extend(

-        GetTestsForAllIterations({}, [FilterFlag(TEST_FILTER)])[0])

-

-  if not SHARDED_TESTS:

-    SHARDED_TESTS.extend(

-        GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',

-                                  SHARD_INDEX_ENV_VAR: '1'},

-                                 [])[0])

-

-  if not SHUFFLED_ALL_TESTS:

-    SHUFFLED_ALL_TESTS.extend(GetTestsForAllIterations(

-        {}, [AlsoRunDisabledTestsFlag(), ShuffleFlag(), RandomSeedFlag(1)])[0])

-

-  if not SHUFFLED_ACTIVE_TESTS:

-    SHUFFLED_ACTIVE_TESTS.extend(GetTestsForAllIterations(

-        {}, [ShuffleFlag(), RandomSeedFlag(1)])[0])

-

-  if not SHUFFLED_FILTERED_TESTS:

-    SHUFFLED_FILTERED_TESTS.extend(GetTestsForAllIterations(

-        {}, [ShuffleFlag(), RandomSeedFlag(1), FilterFlag(TEST_FILTER)])[0])

-

-  if not SHUFFLED_SHARDED_TESTS:

-    SHUFFLED_SHARDED_TESTS.extend(

-        GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',

-                                  SHARD_INDEX_ENV_VAR: '1'},

-                                 [ShuffleFlag(), RandomSeedFlag(1)])[0])

-

-

-class GTestShuffleUnitTest(gtest_test_utils.TestCase):

-  """Tests test shuffling."""

-

-  def setUp(self):

-    CalculateTestLists()

-

-  def testShufflePreservesNumberOfTests(self):

-    self.assertEqual(len(ALL_TESTS), len(SHUFFLED_ALL_TESTS))

-    self.assertEqual(len(ACTIVE_TESTS), len(SHUFFLED_ACTIVE_TESTS))

-    self.assertEqual(len(FILTERED_TESTS), len(SHUFFLED_FILTERED_TESTS))

-    self.assertEqual(len(SHARDED_TESTS), len(SHUFFLED_SHARDED_TESTS))

-

-  def testShuffleChangesTestOrder(self):

-    self.assert_(SHUFFLED_ALL_TESTS != ALL_TESTS, SHUFFLED_ALL_TESTS)

-    self.assert_(SHUFFLED_ACTIVE_TESTS != ACTIVE_TESTS, SHUFFLED_ACTIVE_TESTS)

-    self.assert_(SHUFFLED_FILTERED_TESTS != FILTERED_TESTS,

-                 SHUFFLED_FILTERED_TESTS)

-    self.assert_(SHUFFLED_SHARDED_TESTS != SHARDED_TESTS,

-                 SHUFFLED_SHARDED_TESTS)

-

-  def testShuffleChangesTestCaseOrder(self):

-    self.assert_(GetTestCases(SHUFFLED_ALL_TESTS) != GetTestCases(ALL_TESTS),

-                 GetTestCases(SHUFFLED_ALL_TESTS))

-    self.assert_(

-        GetTestCases(SHUFFLED_ACTIVE_TESTS) != GetTestCases(ACTIVE_TESTS),

-        GetTestCases(SHUFFLED_ACTIVE_TESTS))

-    self.assert_(

-        GetTestCases(SHUFFLED_FILTERED_TESTS) != GetTestCases(FILTERED_TESTS),

-        GetTestCases(SHUFFLED_FILTERED_TESTS))

-    self.assert_(

-        GetTestCases(SHUFFLED_SHARDED_TESTS) != GetTestCases(SHARDED_TESTS),

-        GetTestCases(SHUFFLED_SHARDED_TESTS))

-

-  def testShuffleDoesNotRepeatTest(self):

-    for test in SHUFFLED_ALL_TESTS:

-      self.assertEqual(1, SHUFFLED_ALL_TESTS.count(test),

-                       '%s appears more than once' % (test,))

-    for test in SHUFFLED_ACTIVE_TESTS:

-      self.assertEqual(1, SHUFFLED_ACTIVE_TESTS.count(test),

-                       '%s appears more than once' % (test,))

-    for test in SHUFFLED_FILTERED_TESTS:

-      self.assertEqual(1, SHUFFLED_FILTERED_TESTS.count(test),

-                       '%s appears more than once' % (test,))

-    for test in SHUFFLED_SHARDED_TESTS:

-      self.assertEqual(1, SHUFFLED_SHARDED_TESTS.count(test),

-                       '%s appears more than once' % (test,))

-

-  def testShuffleDoesNotCreateNewTest(self):

-    for test in SHUFFLED_ALL_TESTS:

-      self.assert_(test in ALL_TESTS, '%s is an invalid test' % (test,))

-    for test in SHUFFLED_ACTIVE_TESTS:

-      self.assert_(test in ACTIVE_TESTS, '%s is an invalid test' % (test,))

-    for test in SHUFFLED_FILTERED_TESTS:

-      self.assert_(test in FILTERED_TESTS, '%s is an invalid test' % (test,))

-    for test in SHUFFLED_SHARDED_TESTS:

-      self.assert_(test in SHARDED_TESTS, '%s is an invalid test' % (test,))

-

-  def testShuffleIncludesAllTests(self):

-    for test in ALL_TESTS:

-      self.assert_(test in SHUFFLED_ALL_TESTS, '%s is missing' % (test,))

-    for test in ACTIVE_TESTS:

-      self.assert_(test in SHUFFLED_ACTIVE_TESTS, '%s is missing' % (test,))

-    for test in FILTERED_TESTS:

-      self.assert_(test in SHUFFLED_FILTERED_TESTS, '%s is missing' % (test,))

-    for test in SHARDED_TESTS:

-      self.assert_(test in SHUFFLED_SHARDED_TESTS, '%s is missing' % (test,))

-

-  def testShuffleLeavesDeathTestsAtFront(self):

-    non_death_test_found = False

-    for test in SHUFFLED_ACTIVE_TESTS:

-      if 'DeathTest.' in test:

-        self.assert_(not non_death_test_found,

-                     '%s appears after a non-death test' % (test,))

-      else:

-        non_death_test_found = True

-

-  def _VerifyTestCasesDoNotInterleave(self, tests):

-    test_cases = []

-    for test in tests:

-      [test_case, _] = test.split('.')

-      if test_cases and test_cases[-1] != test_case:

-        test_cases.append(test_case)

-        self.assertEqual(1, test_cases.count(test_case),

-                         'Test case %s is not grouped together in %s' %

-                         (test_case, tests))

-

-  def testShuffleDoesNotInterleaveTestCases(self):

-    self._VerifyTestCasesDoNotInterleave(SHUFFLED_ALL_TESTS)

-    self._VerifyTestCasesDoNotInterleave(SHUFFLED_ACTIVE_TESTS)

-    self._VerifyTestCasesDoNotInterleave(SHUFFLED_FILTERED_TESTS)

-    self._VerifyTestCasesDoNotInterleave(SHUFFLED_SHARDED_TESTS)

-

-  def testShuffleRestoresOrderAfterEachIteration(self):

-    # Get the test lists in all 3 iterations, using random seed 1, 2,

-    # and 3 respectively.  Google Test picks a different seed in each

-    # iteration, and this test depends on the current implementation

-    # picking successive numbers.  This dependency is not ideal, but

-    # makes the test much easier to write.

-    [tests_in_iteration1, tests_in_iteration2, tests_in_iteration3] = (

-        GetTestsForAllIterations(

-            {}, [ShuffleFlag(), RandomSeedFlag(1), RepeatFlag(3)]))

-

-    # Make sure running the tests with random seed 1 gets the same

-    # order as in iteration 1 above.

-    [tests_with_seed1] = GetTestsForAllIterations(

-        {}, [ShuffleFlag(), RandomSeedFlag(1)])

-    self.assertEqual(tests_in_iteration1, tests_with_seed1)

-

-    # Make sure running the tests with random seed 2 gets the same

-    # order as in iteration 2 above.  Success means that Google Test

-    # correctly restores the test order before re-shuffling at the

-    # beginning of iteration 2.

-    [tests_with_seed2] = GetTestsForAllIterations(

-        {}, [ShuffleFlag(), RandomSeedFlag(2)])

-    self.assertEqual(tests_in_iteration2, tests_with_seed2)

-

-    # Make sure running the tests with random seed 3 gets the same

-    # order as in iteration 3 above.  Success means that Google Test

-    # correctly restores the test order before re-shuffling at the

-    # beginning of iteration 3.

-    [tests_with_seed3] = GetTestsForAllIterations(

-        {}, [ShuffleFlag(), RandomSeedFlag(3)])

-    self.assertEqual(tests_in_iteration3, tests_with_seed3)

-

-  def testShuffleGeneratesNewOrderInEachIteration(self):

-    [tests_in_iteration1, tests_in_iteration2, tests_in_iteration3] = (

-        GetTestsForAllIterations(

-            {}, [ShuffleFlag(), RandomSeedFlag(1), RepeatFlag(3)]))

-

-    self.assert_(tests_in_iteration1 != tests_in_iteration2,

-                 tests_in_iteration1)

-    self.assert_(tests_in_iteration1 != tests_in_iteration3,

-                 tests_in_iteration1)

-    self.assert_(tests_in_iteration2 != tests_in_iteration3,

-                 tests_in_iteration2)

-

-  def testShuffleShardedTestsPreservesPartition(self):

-    # If we run M tests on N shards, the same M tests should be run in

-    # total, regardless of the random seeds used by the shards.

-    [tests1] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',

-                                         SHARD_INDEX_ENV_VAR: '0'},

-                                        [ShuffleFlag(), RandomSeedFlag(1)])

-    [tests2] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',

-                                         SHARD_INDEX_ENV_VAR: '1'},

-                                        [ShuffleFlag(), RandomSeedFlag(20)])

-    [tests3] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',

-                                         SHARD_INDEX_ENV_VAR: '2'},

-                                        [ShuffleFlag(), RandomSeedFlag(25)])

-    sorted_sharded_tests = tests1 + tests2 + tests3

-    sorted_sharded_tests.sort()

-    sorted_active_tests = []

-    sorted_active_tests.extend(ACTIVE_TESTS)

-    sorted_active_tests.sort()

-    self.assertEqual(sorted_active_tests, sorted_sharded_tests)

-

-if __name__ == '__main__':

-  gtest_test_utils.Main()

+#!/usr/bin/env python
+#
+# Copyright 2009 Google Inc. All Rights Reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Verifies that test shuffling works."""
+
+__author__ = '[email protected] (Zhanyong Wan)'
+
+import os
+import gtest_test_utils
+
+# Command to run the gtest_shuffle_test_ program.
+COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_shuffle_test_')
+
+# The environment variables for test sharding.
+TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS'
+SHARD_INDEX_ENV_VAR = 'GTEST_SHARD_INDEX'
+
+TEST_FILTER = 'A*.A:A*.B:C*'
+
+ALL_TESTS = []
+ACTIVE_TESTS = []
+FILTERED_TESTS = []
+SHARDED_TESTS = []
+
+SHUFFLED_ALL_TESTS = []
+SHUFFLED_ACTIVE_TESTS = []
+SHUFFLED_FILTERED_TESTS = []
+SHUFFLED_SHARDED_TESTS = []
+
+
+def AlsoRunDisabledTestsFlag():
+  return '--gtest_also_run_disabled_tests'
+
+
+def FilterFlag(test_filter):
+  return '--gtest_filter=%s' % (test_filter,)
+
+
+def RepeatFlag(n):
+  return '--gtest_repeat=%s' % (n,)
+
+
+def ShuffleFlag():
+  return '--gtest_shuffle'
+
+
+def RandomSeedFlag(n):
+  return '--gtest_random_seed=%s' % (n,)
+
+
+def RunAndReturnOutput(extra_env, args):
+  """Runs the test program and returns its output."""
+
+  try:
+    original_env = os.environ.copy()
+    os.environ.update(extra_env)
+    return gtest_test_utils.Subprocess([COMMAND] + args).output
+  finally:
+    for key in extra_env.iterkeys():
+      if key in original_env:
+        os.environ[key] = original_env[key]
+      else:
+        del os.environ[key]
+
+
+def GetTestsForAllIterations(extra_env, args):
+  """Runs the test program and returns a list of test lists.
+
+  Args:
+    extra_env: a map from environment variables to their values
+    args: command line flags to pass to gtest_shuffle_test_
+
+  Returns:
+    A list where the i-th element is the list of tests run in the i-th
+    test iteration.
+  """
+
+  test_iterations = []
+  for line in RunAndReturnOutput(extra_env, args).split('\n'):
+    if line.startswith('----'):
+      tests = []
+      test_iterations.append(tests)
+    elif line.strip():
+      tests.append(line.strip())  # 'TestCaseName.TestName'
+
+  return test_iterations
+
+
+def GetTestCases(tests):
+  """Returns a list of test cases in the given full test names.
+
+  Args:
+    tests: a list of full test names
+
+  Returns:
+    A list of test cases from 'tests', in their original order.
+    Consecutive duplicates are removed.
+  """
+
+  test_cases = []
+  for test in tests:
+    test_case = test.split('.')[0]
+    if not test_case in test_cases:
+      test_cases.append(test_case)
+
+  return test_cases
+
+
+def CalculateTestLists():
+  """Calculates the list of tests run under different flags."""
+
+  if not ALL_TESTS:
+    ALL_TESTS.extend(
+        GetTestsForAllIterations({}, [AlsoRunDisabledTestsFlag()])[0])
+
+  if not ACTIVE_TESTS:
+    ACTIVE_TESTS.extend(GetTestsForAllIterations({}, [])[0])
+
+  if not FILTERED_TESTS:
+    FILTERED_TESTS.extend(
+        GetTestsForAllIterations({}, [FilterFlag(TEST_FILTER)])[0])
+
+  if not SHARDED_TESTS:
+    SHARDED_TESTS.extend(
+        GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
+                                  SHARD_INDEX_ENV_VAR: '1'},
+                                 [])[0])
+
+  if not SHUFFLED_ALL_TESTS:
+    SHUFFLED_ALL_TESTS.extend(GetTestsForAllIterations(
+        {}, [AlsoRunDisabledTestsFlag(), ShuffleFlag(), RandomSeedFlag(1)])[0])
+
+  if not SHUFFLED_ACTIVE_TESTS:
+    SHUFFLED_ACTIVE_TESTS.extend(GetTestsForAllIterations(
+        {}, [ShuffleFlag(), RandomSeedFlag(1)])[0])
+
+  if not SHUFFLED_FILTERED_TESTS:
+    SHUFFLED_FILTERED_TESTS.extend(GetTestsForAllIterations(
+        {}, [ShuffleFlag(), RandomSeedFlag(1), FilterFlag(TEST_FILTER)])[0])
+
+  if not SHUFFLED_SHARDED_TESTS:
+    SHUFFLED_SHARDED_TESTS.extend(
+        GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
+                                  SHARD_INDEX_ENV_VAR: '1'},
+                                 [ShuffleFlag(), RandomSeedFlag(1)])[0])
+
+
+class GTestShuffleUnitTest(gtest_test_utils.TestCase):
+  """Tests test shuffling."""
+
+  def setUp(self):
+    CalculateTestLists()
+
+  def testShufflePreservesNumberOfTests(self):
+    self.assertEqual(len(ALL_TESTS), len(SHUFFLED_ALL_TESTS))
+    self.assertEqual(len(ACTIVE_TESTS), len(SHUFFLED_ACTIVE_TESTS))
+    self.assertEqual(len(FILTERED_TESTS), len(SHUFFLED_FILTERED_TESTS))
+    self.assertEqual(len(SHARDED_TESTS), len(SHUFFLED_SHARDED_TESTS))
+
+  def testShuffleChangesTestOrder(self):
+    self.assert_(SHUFFLED_ALL_TESTS != ALL_TESTS, SHUFFLED_ALL_TESTS)
+    self.assert_(SHUFFLED_ACTIVE_TESTS != ACTIVE_TESTS, SHUFFLED_ACTIVE_TESTS)
+    self.assert_(SHUFFLED_FILTERED_TESTS != FILTERED_TESTS,
+                 SHUFFLED_FILTERED_TESTS)
+    self.assert_(SHUFFLED_SHARDED_TESTS != SHARDED_TESTS,
+                 SHUFFLED_SHARDED_TESTS)
+
+  def testShuffleChangesTestCaseOrder(self):
+    self.assert_(GetTestCases(SHUFFLED_ALL_TESTS) != GetTestCases(ALL_TESTS),
+                 GetTestCases(SHUFFLED_ALL_TESTS))
+    self.assert_(
+        GetTestCases(SHUFFLED_ACTIVE_TESTS) != GetTestCases(ACTIVE_TESTS),
+        GetTestCases(SHUFFLED_ACTIVE_TESTS))
+    self.assert_(
+        GetTestCases(SHUFFLED_FILTERED_TESTS) != GetTestCases(FILTERED_TESTS),
+        GetTestCases(SHUFFLED_FILTERED_TESTS))
+    self.assert_(
+        GetTestCases(SHUFFLED_SHARDED_TESTS) != GetTestCases(SHARDED_TESTS),
+        GetTestCases(SHUFFLED_SHARDED_TESTS))
+
+  def testShuffleDoesNotRepeatTest(self):
+    for test in SHUFFLED_ALL_TESTS:
+      self.assertEqual(1, SHUFFLED_ALL_TESTS.count(test),
+                       '%s appears more than once' % (test,))
+    for test in SHUFFLED_ACTIVE_TESTS:
+      self.assertEqual(1, SHUFFLED_ACTIVE_TESTS.count(test),
+                       '%s appears more than once' % (test,))
+    for test in SHUFFLED_FILTERED_TESTS:
+      self.assertEqual(1, SHUFFLED_FILTERED_TESTS.count(test),
+                       '%s appears more than once' % (test,))
+    for test in SHUFFLED_SHARDED_TESTS:
+      self.assertEqual(1, SHUFFLED_SHARDED_TESTS.count(test),
+                       '%s appears more than once' % (test,))
+
+  def testShuffleDoesNotCreateNewTest(self):
+    for test in SHUFFLED_ALL_TESTS:
+      self.assert_(test in ALL_TESTS, '%s is an invalid test' % (test,))
+    for test in SHUFFLED_ACTIVE_TESTS:
+      self.assert_(test in ACTIVE_TESTS, '%s is an invalid test' % (test,))
+    for test in SHUFFLED_FILTERED_TESTS:
+      self.assert_(test in FILTERED_TESTS, '%s is an invalid test' % (test,))
+    for test in SHUFFLED_SHARDED_TESTS:
+      self.assert_(test in SHARDED_TESTS, '%s is an invalid test' % (test,))
+
+  def testShuffleIncludesAllTests(self):
+    for test in ALL_TESTS:
+      self.assert_(test in SHUFFLED_ALL_TESTS, '%s is missing' % (test,))
+    for test in ACTIVE_TESTS:
+      self.assert_(test in SHUFFLED_ACTIVE_TESTS, '%s is missing' % (test,))
+    for test in FILTERED_TESTS:
+      self.assert_(test in SHUFFLED_FILTERED_TESTS, '%s is missing' % (test,))
+    for test in SHARDED_TESTS:
+      self.assert_(test in SHUFFLED_SHARDED_TESTS, '%s is missing' % (test,))
+
+  def testShuffleLeavesDeathTestsAtFront(self):
+    non_death_test_found = False
+    for test in SHUFFLED_ACTIVE_TESTS:
+      if 'DeathTest.' in test:
+        self.assert_(not non_death_test_found,
+                     '%s appears after a non-death test' % (test,))
+      else:
+        non_death_test_found = True
+
+  def _VerifyTestCasesDoNotInterleave(self, tests):
+    test_cases = []
+    for test in tests:
+      [test_case, _] = test.split('.')
+      if test_cases and test_cases[-1] != test_case:
+        test_cases.append(test_case)
+        self.assertEqual(1, test_cases.count(test_case),
+                         'Test case %s is not grouped together in %s' %
+                         (test_case, tests))
+
+  def testShuffleDoesNotInterleaveTestCases(self):
+    self._VerifyTestCasesDoNotInterleave(SHUFFLED_ALL_TESTS)
+    self._VerifyTestCasesDoNotInterleave(SHUFFLED_ACTIVE_TESTS)
+    self._VerifyTestCasesDoNotInterleave(SHUFFLED_FILTERED_TESTS)
+    self._VerifyTestCasesDoNotInterleave(SHUFFLED_SHARDED_TESTS)
+
+  def testShuffleRestoresOrderAfterEachIteration(self):
+    # Get the test lists in all 3 iterations, using random seed 1, 2,
+    # and 3 respectively.  Google Test picks a different seed in each
+    # iteration, and this test depends on the current implementation
+    # picking successive numbers.  This dependency is not ideal, but
+    # makes the test much easier to write.
+    [tests_in_iteration1, tests_in_iteration2, tests_in_iteration3] = (
+        GetTestsForAllIterations(
+            {}, [ShuffleFlag(), RandomSeedFlag(1), RepeatFlag(3)]))
+
+    # Make sure running the tests with random seed 1 gets the same
+    # order as in iteration 1 above.
+    [tests_with_seed1] = GetTestsForAllIterations(
+        {}, [ShuffleFlag(), RandomSeedFlag(1)])
+    self.assertEqual(tests_in_iteration1, tests_with_seed1)
+
+    # Make sure running the tests with random seed 2 gets the same
+    # order as in iteration 2 above.  Success means that Google Test
+    # correctly restores the test order before re-shuffling at the
+    # beginning of iteration 2.
+    [tests_with_seed2] = GetTestsForAllIterations(
+        {}, [ShuffleFlag(), RandomSeedFlag(2)])
+    self.assertEqual(tests_in_iteration2, tests_with_seed2)
+
+    # Make sure running the tests with random seed 3 gets the same
+    # order as in iteration 3 above.  Success means that Google Test
+    # correctly restores the test order before re-shuffling at the
+    # beginning of iteration 3.
+    [tests_with_seed3] = GetTestsForAllIterations(
+        {}, [ShuffleFlag(), RandomSeedFlag(3)])
+    self.assertEqual(tests_in_iteration3, tests_with_seed3)
+
+  def testShuffleGeneratesNewOrderInEachIteration(self):
+    [tests_in_iteration1, tests_in_iteration2, tests_in_iteration3] = (
+        GetTestsForAllIterations(
+            {}, [ShuffleFlag(), RandomSeedFlag(1), RepeatFlag(3)]))
+
+    self.assert_(tests_in_iteration1 != tests_in_iteration2,
+                 tests_in_iteration1)
+    self.assert_(tests_in_iteration1 != tests_in_iteration3,
+                 tests_in_iteration1)
+    self.assert_(tests_in_iteration2 != tests_in_iteration3,
+                 tests_in_iteration2)
+
+  def testShuffleShardedTestsPreservesPartition(self):
+    # If we run M tests on N shards, the same M tests should be run in
+    # total, regardless of the random seeds used by the shards.
+    [tests1] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
+                                         SHARD_INDEX_ENV_VAR: '0'},
+                                        [ShuffleFlag(), RandomSeedFlag(1)])
+    [tests2] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
+                                         SHARD_INDEX_ENV_VAR: '1'},
+                                        [ShuffleFlag(), RandomSeedFlag(20)])
+    [tests3] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
+                                         SHARD_INDEX_ENV_VAR: '2'},
+                                        [ShuffleFlag(), RandomSeedFlag(25)])
+    sorted_sharded_tests = tests1 + tests2 + tests3
+    sorted_sharded_tests.sort()
+    sorted_active_tests = []
+    sorted_active_tests.extend(ACTIVE_TESTS)
+    sorted_active_tests.sort()
+    self.assertEqual(sorted_active_tests, sorted_sharded_tests)
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_test_utils.py b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_test_utils.py
index b6c444f9..385662ad 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_test_utils.py
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_test_utils.py
@@ -1,270 +1,270 @@
-#!/usr/bin/env python

-#

-# Copyright 2006, Google Inc.

-# All rights reserved.

-#

-# Redistribution and use in source and binary forms, with or without

-# modification, are permitted provided that the following conditions are

-# met:

-#

-#     * Redistributions of source code must retain the above copyright

-# notice, this list of conditions and the following disclaimer.

-#     * Redistributions in binary form must reproduce the above

-# copyright notice, this list of conditions and the following disclaimer

-# in the documentation and/or other materials provided with the

-# distribution.

-#     * Neither the name of Google Inc. nor the names of its

-# contributors may be used to endorse or promote products derived from

-# this software without specific prior written permission.

-#

-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-"""Unit test utilities for Google C++ Testing Framework."""

-

-__author__ = '[email protected] (Zhanyong Wan)'

-

-import atexit

-import os

-import shutil

-import sys

-import tempfile

-import unittest

-_test_module = unittest

-

-# Suppresses the 'Import not at the top of the file' lint complaint.

-# pylint: disable-msg=C6204

-try:

-  import subprocess

-  _SUBPROCESS_MODULE_AVAILABLE = True

-except:

-  import popen2

-  _SUBPROCESS_MODULE_AVAILABLE = False

-# pylint: enable-msg=C6204

-

-

-IS_WINDOWS = os.name == 'nt'

-IS_CYGWIN = os.name == 'posix' and 'CYGWIN' in os.uname()[0]

-

-# Here we expose a class from a particular module, depending on the

-# environment. The comment suppresses the 'Invalid variable name' lint

-# complaint.

-TestCase = _test_module.TestCase  # pylint: disable-msg=C6409

-

-# Initially maps a flag to its default value. After

-# _ParseAndStripGTestFlags() is called, maps a flag to its actual value.

-_flag_map = {'gtest_source_dir': os.path.dirname(sys.argv[0]),

-             'gtest_build_dir': os.path.dirname(sys.argv[0])}

-_gtest_flags_are_parsed = False

-

-

-def _ParseAndStripGTestFlags(argv):

-  """Parses and strips Google Test flags from argv.  This is idempotent."""

-

-  # Suppresses the lint complaint about a global variable since we need it

-  # here to maintain module-wide state.

-  global _gtest_flags_are_parsed  # pylint: disable-msg=W0603

-  if _gtest_flags_are_parsed:

-    return

-

-  _gtest_flags_are_parsed = True

-  for flag in _flag_map:

-    # The environment variable overrides the default value.

-    if flag.upper() in os.environ:

-      _flag_map[flag] = os.environ[flag.upper()]

-

-    # The command line flag overrides the environment variable.

-    i = 1  # Skips the program name.

-    while i < len(argv):

-      prefix = '--' + flag + '='

-      if argv[i].startswith(prefix):

-        _flag_map[flag] = argv[i][len(prefix):]

-        del argv[i]

-        break

-      else:

-        # We don't increment i in case we just found a --gtest_* flag

-        # and removed it from argv.

-        i += 1

-

-

-def GetFlag(flag):

-  """Returns the value of the given flag."""

-

-  # In case GetFlag() is called before Main(), we always call

-  # _ParseAndStripGTestFlags() here to make sure the --gtest_* flags

-  # are parsed.

-  _ParseAndStripGTestFlags(sys.argv)

-

-  return _flag_map[flag]

-

-

-def GetSourceDir():

-  """Returns the absolute path of the directory where the .py files are."""

-

-  return os.path.abspath(GetFlag('gtest_source_dir'))

-

-

-def GetBuildDir():

-  """Returns the absolute path of the directory where the test binaries are."""

-

-  return os.path.abspath(GetFlag('gtest_build_dir'))

-

-

-_temp_dir = None

-

-def _RemoveTempDir():

-  if _temp_dir:

-    shutil.rmtree(_temp_dir, ignore_errors=True)

-

-atexit.register(_RemoveTempDir)

-

-

-def GetTempDir():

-  """Returns a directory for temporary files."""

-

-  global _temp_dir

-  if not _temp_dir:

-    _temp_dir = tempfile.mkdtemp()

-  return _temp_dir

-

-

-def GetTestExecutablePath(executable_name):

-  """Returns the absolute path of the test binary given its name.

-

-  The function will print a message and abort the program if the resulting file

-  doesn't exist.

-

-  Args:

-    executable_name: name of the test binary that the test script runs.

-

-  Returns:

-    The absolute path of the test binary.

-  """

-

-  path = os.path.abspath(os.path.join(GetBuildDir(), executable_name))

-  if (IS_WINDOWS or IS_CYGWIN) and not path.endswith('.exe'):

-    path += '.exe'

-

-  if not os.path.exists(path):

-    message = (

-        'Unable to find the test binary. Please make sure to provide path\n'

-        'to the binary via the --gtest_build_dir flag or the GTEST_BUILD_DIR\n'

-        'environment variable. For convenient use, invoke this script via\n'

-        'mk_test.py.\n'

-        # TODO([email protected]): change mk_test.py to test.py after renaming

-        # the file.

-        'Please run mk_test.py -h for help.')

-    print >> sys.stderr, message

-    sys.exit(1)

-

-  return path

-

-

-def GetExitStatus(exit_code):

-  """Returns the argument to exit(), or -1 if exit() wasn't called.

-

-  Args:

-    exit_code: the result value of os.system(command).

-  """

-

-  if os.name == 'nt':

-    # On Windows, os.WEXITSTATUS() doesn't work and os.system() returns

-    # the argument to exit() directly.

-    return exit_code

-  else:

-    # On Unix, os.WEXITSTATUS() must be used to extract the exit status

-    # from the result of os.system().

-    if os.WIFEXITED(exit_code):

-      return os.WEXITSTATUS(exit_code)

-    else:

-      return -1

-

-

-class Subprocess:

-  def __init__(self, command, working_dir=None, capture_stderr=True):

-    """Changes into a specified directory, if provided, and executes a command.

-    Restores the old directory afterwards. Execution results are returned

-    via the following attributes:

-      terminated_by_sygnal   True iff the child process has been terminated

-                             by a signal.

-      signal                 Sygnal that terminated the child process.

-      exited                 True iff the child process exited normally.

-      exit_code              The code with which the child proces exited.

-      output                 Child process's stdout and stderr output

-                             combined in a string.

-

-    Args:

-      command:        The command to run, in the form of sys.argv.

-      working_dir:    The directory to change into.

-      capture_stderr: Determines whether to capture stderr in the output member

-                      or to discard it.

-    """

-

-    # The subprocess module is the preferrable way of running programs

-    # since it is available and behaves consistently on all platforms,

-    # including Windows. But it is only available starting in python 2.4.

-    # In earlier python versions, we revert to the popen2 module, which is

-    # available in python 2.0 and later but doesn't provide required

-    # functionality (Popen4) under Windows. This allows us to support Mac

-    # OS X 10.4 Tiger, which has python 2.3 installed.

-    if _SUBPROCESS_MODULE_AVAILABLE:

-      if capture_stderr:

-        stderr = subprocess.STDOUT

-      else:

-        stderr = subprocess.PIPE

-

-      p = subprocess.Popen(command,

-                           stdout=subprocess.PIPE, stderr=stderr,

-                           cwd=working_dir, universal_newlines=True)

-      # communicate returns a tuple with the file obect for the child's

-      # output.

-      self.output = p.communicate()[0]

-      self._return_code = p.returncode

-    else:

-      old_dir = os.getcwd()

-      try:

-        if working_dir is not None:

-          os.chdir(working_dir)

-        if capture_stderr:

-          p = popen2.Popen4(command)

-        else:

-          p = popen2.Popen3(command)

-        p.tochild.close()

-        self.output = p.fromchild.read()

-        ret_code = p.wait()

-      finally:

-        os.chdir(old_dir)

-      # Converts ret_code to match the semantics of

-      # subprocess.Popen.returncode.

-      if os.WIFSIGNALED(ret_code):

-        self._return_code = -os.WTERMSIG(ret_code)

-      else:  # os.WIFEXITED(ret_code) should return True here.

-        self._return_code = os.WEXITSTATUS(ret_code)

-

-    if self._return_code < 0:

-      self.terminated_by_signal = True

-      self.exited = False

-      self.signal = -self._return_code

-    else:

-      self.terminated_by_signal = False

-      self.exited = True

-      self.exit_code = self._return_code

-

-

-def Main():

-  """Runs the unit test."""

-

-  # We must call _ParseAndStripGTestFlags() before calling

-  # unittest.main().  Otherwise the latter will be confused by the

-  # --gtest_* flags.

-  _ParseAndStripGTestFlags(sys.argv)

-  _test_module.main()

+#!/usr/bin/env python
+#
+# Copyright 2006, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Unit test utilities for Google C++ Testing Framework."""
+
+__author__ = '[email protected] (Zhanyong Wan)'
+
+import atexit
+import os
+import shutil
+import sys
+import tempfile
+import unittest
+_test_module = unittest
+
+# Suppresses the 'Import not at the top of the file' lint complaint.
+# pylint: disable-msg=C6204
+try:
+  import subprocess
+  _SUBPROCESS_MODULE_AVAILABLE = True
+except:
+  import popen2
+  _SUBPROCESS_MODULE_AVAILABLE = False
+# pylint: enable-msg=C6204
+
+
+IS_WINDOWS = os.name == 'nt'
+IS_CYGWIN = os.name == 'posix' and 'CYGWIN' in os.uname()[0]
+
+# Here we expose a class from a particular module, depending on the
+# environment. The comment suppresses the 'Invalid variable name' lint
+# complaint.
+TestCase = _test_module.TestCase  # pylint: disable-msg=C6409
+
+# Initially maps a flag to its default value. After
+# _ParseAndStripGTestFlags() is called, maps a flag to its actual value.
+_flag_map = {'gtest_source_dir': os.path.dirname(sys.argv[0]),
+             'gtest_build_dir': os.path.dirname(sys.argv[0])}
+_gtest_flags_are_parsed = False
+
+
+def _ParseAndStripGTestFlags(argv):
+  """Parses and strips Google Test flags from argv.  This is idempotent."""
+
+  # Suppresses the lint complaint about a global variable since we need it
+  # here to maintain module-wide state.
+  global _gtest_flags_are_parsed  # pylint: disable-msg=W0603
+  if _gtest_flags_are_parsed:
+    return
+
+  _gtest_flags_are_parsed = True
+  for flag in _flag_map:
+    # The environment variable overrides the default value.
+    if flag.upper() in os.environ:
+      _flag_map[flag] = os.environ[flag.upper()]
+
+    # The command line flag overrides the environment variable.
+    i = 1  # Skips the program name.
+    while i < len(argv):
+      prefix = '--' + flag + '='
+      if argv[i].startswith(prefix):
+        _flag_map[flag] = argv[i][len(prefix):]
+        del argv[i]
+        break
+      else:
+        # We don't increment i in case we just found a --gtest_* flag
+        # and removed it from argv.
+        i += 1
+
+
+def GetFlag(flag):
+  """Returns the value of the given flag."""
+
+  # In case GetFlag() is called before Main(), we always call
+  # _ParseAndStripGTestFlags() here to make sure the --gtest_* flags
+  # are parsed.
+  _ParseAndStripGTestFlags(sys.argv)
+
+  return _flag_map[flag]
+
+
+def GetSourceDir():
+  """Returns the absolute path of the directory where the .py files are."""
+
+  return os.path.abspath(GetFlag('gtest_source_dir'))
+
+
+def GetBuildDir():
+  """Returns the absolute path of the directory where the test binaries are."""
+
+  return os.path.abspath(GetFlag('gtest_build_dir'))
+
+
+_temp_dir = None
+
+def _RemoveTempDir():
+  if _temp_dir:
+    shutil.rmtree(_temp_dir, ignore_errors=True)
+
+atexit.register(_RemoveTempDir)
+
+
+def GetTempDir():
+  """Returns a directory for temporary files."""
+
+  global _temp_dir
+  if not _temp_dir:
+    _temp_dir = tempfile.mkdtemp()
+  return _temp_dir
+
+
+def GetTestExecutablePath(executable_name):
+  """Returns the absolute path of the test binary given its name.
+
+  The function will print a message and abort the program if the resulting file
+  doesn't exist.
+
+  Args:
+    executable_name: name of the test binary that the test script runs.
+
+  Returns:
+    The absolute path of the test binary.
+  """
+
+  path = os.path.abspath(os.path.join(GetBuildDir(), executable_name))
+  if (IS_WINDOWS or IS_CYGWIN) and not path.endswith('.exe'):
+    path += '.exe'
+
+  if not os.path.exists(path):
+    message = (
+        'Unable to find the test binary. Please make sure to provide path\n'
+        'to the binary via the --gtest_build_dir flag or the GTEST_BUILD_DIR\n'
+        'environment variable. For convenient use, invoke this script via\n'
+        'mk_test.py.\n'
+        # TODO([email protected]): change mk_test.py to test.py after renaming
+        # the file.
+        'Please run mk_test.py -h for help.')
+    print >> sys.stderr, message
+    sys.exit(1)
+
+  return path
+
+
+def GetExitStatus(exit_code):
+  """Returns the argument to exit(), or -1 if exit() wasn't called.
+
+  Args:
+    exit_code: the result value of os.system(command).
+  """
+
+  if os.name == 'nt':
+    # On Windows, os.WEXITSTATUS() doesn't work and os.system() returns
+    # the argument to exit() directly.
+    return exit_code
+  else:
+    # On Unix, os.WEXITSTATUS() must be used to extract the exit status
+    # from the result of os.system().
+    if os.WIFEXITED(exit_code):
+      return os.WEXITSTATUS(exit_code)
+    else:
+      return -1
+
+
+class Subprocess:
+  def __init__(self, command, working_dir=None, capture_stderr=True):
+    """Changes into a specified directory, if provided, and executes a command.
+    Restores the old directory afterwards. Execution results are returned
+    via the following attributes:
+      terminated_by_sygnal   True iff the child process has been terminated
+                             by a signal.
+      signal                 Sygnal that terminated the child process.
+      exited                 True iff the child process exited normally.
+      exit_code              The code with which the child proces exited.
+      output                 Child process's stdout and stderr output
+                             combined in a string.
+
+    Args:
+      command:        The command to run, in the form of sys.argv.
+      working_dir:    The directory to change into.
+      capture_stderr: Determines whether to capture stderr in the output member
+                      or to discard it.
+    """
+
+    # The subprocess module is the preferrable way of running programs
+    # since it is available and behaves consistently on all platforms,
+    # including Windows. But it is only available starting in python 2.4.
+    # In earlier python versions, we revert to the popen2 module, which is
+    # available in python 2.0 and later but doesn't provide required
+    # functionality (Popen4) under Windows. This allows us to support Mac
+    # OS X 10.4 Tiger, which has python 2.3 installed.
+    if _SUBPROCESS_MODULE_AVAILABLE:
+      if capture_stderr:
+        stderr = subprocess.STDOUT
+      else:
+        stderr = subprocess.PIPE
+
+      p = subprocess.Popen(command,
+                           stdout=subprocess.PIPE, stderr=stderr,
+                           cwd=working_dir, universal_newlines=True)
+      # communicate returns a tuple with the file obect for the child's
+      # output.
+      self.output = p.communicate()[0]
+      self._return_code = p.returncode
+    else:
+      old_dir = os.getcwd()
+      try:
+        if working_dir is not None:
+          os.chdir(working_dir)
+        if capture_stderr:
+          p = popen2.Popen4(command)
+        else:
+          p = popen2.Popen3(command)
+        p.tochild.close()
+        self.output = p.fromchild.read()
+        ret_code = p.wait()
+      finally:
+        os.chdir(old_dir)
+      # Converts ret_code to match the semantics of
+      # subprocess.Popen.returncode.
+      if os.WIFSIGNALED(ret_code):
+        self._return_code = -os.WTERMSIG(ret_code)
+      else:  # os.WIFEXITED(ret_code) should return True here.
+        self._return_code = os.WEXITSTATUS(ret_code)
+
+    if self._return_code < 0:
+      self.terminated_by_signal = True
+      self.exited = False
+      self.signal = -self._return_code
+    else:
+      self.terminated_by_signal = False
+      self.exited = True
+      self.exit_code = self._return_code
+
+
+def Main():
+  """Runs the unit test."""
+
+  # We must call _ParseAndStripGTestFlags() before calling
+  # unittest.main().  Otherwise the latter will be confused by the
+  # --gtest_* flags.
+  _ParseAndStripGTestFlags(sys.argv)
+  _test_module.main()
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_throw_on_failure_test.py b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_throw_on_failure_test.py
index 7ede7854..5678ffea 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_throw_on_failure_test.py
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_throw_on_failure_test.py
@@ -1,171 +1,171 @@
-#!/usr/bin/env python

-#

-# Copyright 2009, Google Inc.

-# All rights reserved.

-#

-# Redistribution and use in source and binary forms, with or without

-# modification, are permitted provided that the following conditions are

-# met:

-#

-#     * Redistributions of source code must retain the above copyright

-# notice, this list of conditions and the following disclaimer.

-#     * Redistributions in binary form must reproduce the above

-# copyright notice, this list of conditions and the following disclaimer

-# in the documentation and/or other materials provided with the

-# distribution.

-#     * Neither the name of Google Inc. nor the names of its

-# contributors may be used to endorse or promote products derived from

-# this software without specific prior written permission.

-#

-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-"""Tests Google Test's throw-on-failure mode with exceptions disabled.

-

-This script invokes gtest_throw_on_failure_test_ (a program written with

-Google Test) with different environments and command line flags.

-"""

-

-__author__ = '[email protected] (Zhanyong Wan)'

-

-import os

-import gtest_test_utils

-

-

-# Constants.

-

-# The command line flag for enabling/disabling the throw-on-failure mode.

-THROW_ON_FAILURE = 'gtest_throw_on_failure'

-

-# Path to the gtest_throw_on_failure_test_ program, compiled with

-# exceptions disabled.

-EXE_PATH = gtest_test_utils.GetTestExecutablePath(

-    'gtest_throw_on_failure_test_')

-

-

-# Utilities.

-

-

-def SetEnvVar(env_var, value):

-  """Sets an environment variable to a given value; unsets it when the

-  given value is None.

-  """

-

-  env_var = env_var.upper()

-  if value is not None:

-    os.environ[env_var] = value

-  elif env_var in os.environ:

-    del os.environ[env_var]

-

-

-def Run(command):

-  """Runs a command; returns True/False if its exit code is/isn't 0."""

-

-  print 'Running "%s". . .' % ' '.join(command)

-  p = gtest_test_utils.Subprocess(command)

-  return p.exited and p.exit_code == 0

-

-

-# The tests.  TODO([email protected]): refactor the class to share common

-# logic with code in gtest_break_on_failure_unittest.py.

-class ThrowOnFailureTest(gtest_test_utils.TestCase):

-  """Tests the throw-on-failure mode."""

-

-  def RunAndVerify(self, env_var_value, flag_value, should_fail):

-    """Runs gtest_throw_on_failure_test_ and verifies that it does

-    (or does not) exit with a non-zero code.

-

-    Args:

-      env_var_value:    value of the GTEST_BREAK_ON_FAILURE environment

-                        variable; None if the variable should be unset.

-      flag_value:       value of the --gtest_break_on_failure flag;

-                        None if the flag should not be present.

-      should_fail:      True iff the program is expected to fail.

-    """

-

-    SetEnvVar(THROW_ON_FAILURE, env_var_value)

-

-    if env_var_value is None:

-      env_var_value_msg = ' is not set'

-    else:

-      env_var_value_msg = '=' + env_var_value

-

-    if flag_value is None:

-      flag = ''

-    elif flag_value == '0':

-      flag = '--%s=0' % THROW_ON_FAILURE

-    else:

-      flag = '--%s' % THROW_ON_FAILURE

-

-    command = [EXE_PATH]

-    if flag:

-      command.append(flag)

-

-    if should_fail:

-      should_or_not = 'should'

-    else:

-      should_or_not = 'should not'

-

-    failed = not Run(command)

-

-    SetEnvVar(THROW_ON_FAILURE, None)

-

-    msg = ('when %s%s, an assertion failure in "%s" %s cause a non-zero '

-           'exit code.' %

-           (THROW_ON_FAILURE, env_var_value_msg, ' '.join(command),

-            should_or_not))

-    self.assert_(failed == should_fail, msg)

-

-  def testDefaultBehavior(self):

-    """Tests the behavior of the default mode."""

-

-    self.RunAndVerify(env_var_value=None, flag_value=None, should_fail=False)

-

-  def testThrowOnFailureEnvVar(self):

-    """Tests using the GTEST_THROW_ON_FAILURE environment variable."""

-

-    self.RunAndVerify(env_var_value='0',

-                      flag_value=None,

-                      should_fail=False)

-    self.RunAndVerify(env_var_value='1',

-                      flag_value=None,

-                      should_fail=True)

-

-  def testThrowOnFailureFlag(self):

-    """Tests using the --gtest_throw_on_failure flag."""

-

-    self.RunAndVerify(env_var_value=None,

-                      flag_value='0',

-                      should_fail=False)

-    self.RunAndVerify(env_var_value=None,

-                      flag_value='1',

-                      should_fail=True)

-

-  def testThrowOnFailureFlagOverridesEnvVar(self):

-    """Tests that --gtest_throw_on_failure overrides GTEST_THROW_ON_FAILURE."""

-

-    self.RunAndVerify(env_var_value='0',

-                      flag_value='0',

-                      should_fail=False)

-    self.RunAndVerify(env_var_value='0',

-                      flag_value='1',

-                      should_fail=True)

-    self.RunAndVerify(env_var_value='1',

-                      flag_value='0',

-                      should_fail=False)

-    self.RunAndVerify(env_var_value='1',

-                      flag_value='1',

-                      should_fail=True)

-

-

-if __name__ == '__main__':

-  gtest_test_utils.Main()

+#!/usr/bin/env python
+#
+# Copyright 2009, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Tests Google Test's throw-on-failure mode with exceptions disabled.
+
+This script invokes gtest_throw_on_failure_test_ (a program written with
+Google Test) with different environments and command line flags.
+"""
+
+__author__ = '[email protected] (Zhanyong Wan)'
+
+import os
+import gtest_test_utils
+
+
+# Constants.
+
+# The command line flag for enabling/disabling the throw-on-failure mode.
+THROW_ON_FAILURE = 'gtest_throw_on_failure'
+
+# Path to the gtest_throw_on_failure_test_ program, compiled with
+# exceptions disabled.
+EXE_PATH = gtest_test_utils.GetTestExecutablePath(
+    'gtest_throw_on_failure_test_')
+
+
+# Utilities.
+
+
+def SetEnvVar(env_var, value):
+  """Sets an environment variable to a given value; unsets it when the
+  given value is None.
+  """
+
+  env_var = env_var.upper()
+  if value is not None:
+    os.environ[env_var] = value
+  elif env_var in os.environ:
+    del os.environ[env_var]
+
+
+def Run(command):
+  """Runs a command; returns True/False if its exit code is/isn't 0."""
+
+  print 'Running "%s". . .' % ' '.join(command)
+  p = gtest_test_utils.Subprocess(command)
+  return p.exited and p.exit_code == 0
+
+
+# The tests.  TODO([email protected]): refactor the class to share common
+# logic with code in gtest_break_on_failure_unittest.py.
+class ThrowOnFailureTest(gtest_test_utils.TestCase):
+  """Tests the throw-on-failure mode."""
+
+  def RunAndVerify(self, env_var_value, flag_value, should_fail):
+    """Runs gtest_throw_on_failure_test_ and verifies that it does
+    (or does not) exit with a non-zero code.
+
+    Args:
+      env_var_value:    value of the GTEST_BREAK_ON_FAILURE environment
+                        variable; None if the variable should be unset.
+      flag_value:       value of the --gtest_break_on_failure flag;
+                        None if the flag should not be present.
+      should_fail:      True iff the program is expected to fail.
+    """
+
+    SetEnvVar(THROW_ON_FAILURE, env_var_value)
+
+    if env_var_value is None:
+      env_var_value_msg = ' is not set'
+    else:
+      env_var_value_msg = '=' + env_var_value
+
+    if flag_value is None:
+      flag = ''
+    elif flag_value == '0':
+      flag = '--%s=0' % THROW_ON_FAILURE
+    else:
+      flag = '--%s' % THROW_ON_FAILURE
+
+    command = [EXE_PATH]
+    if flag:
+      command.append(flag)
+
+    if should_fail:
+      should_or_not = 'should'
+    else:
+      should_or_not = 'should not'
+
+    failed = not Run(command)
+
+    SetEnvVar(THROW_ON_FAILURE, None)
+
+    msg = ('when %s%s, an assertion failure in "%s" %s cause a non-zero '
+           'exit code.' %
+           (THROW_ON_FAILURE, env_var_value_msg, ' '.join(command),
+            should_or_not))
+    self.assert_(failed == should_fail, msg)
+
+  def testDefaultBehavior(self):
+    """Tests the behavior of the default mode."""
+
+    self.RunAndVerify(env_var_value=None, flag_value=None, should_fail=False)
+
+  def testThrowOnFailureEnvVar(self):
+    """Tests using the GTEST_THROW_ON_FAILURE environment variable."""
+
+    self.RunAndVerify(env_var_value='0',
+                      flag_value=None,
+                      should_fail=False)
+    self.RunAndVerify(env_var_value='1',
+                      flag_value=None,
+                      should_fail=True)
+
+  def testThrowOnFailureFlag(self):
+    """Tests using the --gtest_throw_on_failure flag."""
+
+    self.RunAndVerify(env_var_value=None,
+                      flag_value='0',
+                      should_fail=False)
+    self.RunAndVerify(env_var_value=None,
+                      flag_value='1',
+                      should_fail=True)
+
+  def testThrowOnFailureFlagOverridesEnvVar(self):
+    """Tests that --gtest_throw_on_failure overrides GTEST_THROW_ON_FAILURE."""
+
+    self.RunAndVerify(env_var_value='0',
+                      flag_value='0',
+                      should_fail=False)
+    self.RunAndVerify(env_var_value='0',
+                      flag_value='1',
+                      should_fail=True)
+    self.RunAndVerify(env_var_value='1',
+                      flag_value='0',
+                      should_fail=False)
+    self.RunAndVerify(env_var_value='1',
+                      flag_value='1',
+                      should_fail=True)
+
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_uninitialized_test.py b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_uninitialized_test.py
index e11c8fe2..6ae57eee 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_uninitialized_test.py
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_uninitialized_test.py
@@ -1,70 +1,70 @@
-#!/usr/bin/env python

-#

-# Copyright 2008, Google Inc.

-# All rights reserved.

-#

-# Redistribution and use in source and binary forms, with or without

-# modification, are permitted provided that the following conditions are

-# met:

-#

-#     * Redistributions of source code must retain the above copyright

-# notice, this list of conditions and the following disclaimer.

-#     * Redistributions in binary form must reproduce the above

-# copyright notice, this list of conditions and the following disclaimer

-# in the documentation and/or other materials provided with the

-# distribution.

-#     * Neither the name of Google Inc. nor the names of its

-# contributors may be used to endorse or promote products derived from

-# this software without specific prior written permission.

-#

-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-"""Verifies that Google Test warns the user when not initialized properly."""

-

-__author__ = '[email protected] (Zhanyong Wan)'

-

-import gtest_test_utils

-

-

-COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_uninitialized_test_')

-

-

-def Assert(condition):

-  if not condition:

-    raise AssertionError

-

-

-def AssertEq(expected, actual):

-  if expected != actual:

-    print 'Expected: %s' % (expected,)

-    print '  Actual: %s' % (actual,)

-    raise AssertionError

-

-

-def TestExitCodeAndOutput(command):

-  """Runs the given command and verifies its exit code and output."""

-

-  # Verifies that 'command' exits with code 1.

-  p = gtest_test_utils.Subprocess(command)

-  Assert(p.exited)

-  AssertEq(1, p.exit_code)

-  Assert('InitGoogleTest' in p.output)

-

-

-class GTestUninitializedTest(gtest_test_utils.TestCase):

-  def testExitCodeAndOutput(self):

-    TestExitCodeAndOutput(COMMAND)

-

-

-if __name__ == '__main__':

-  gtest_test_utils.Main()

+#!/usr/bin/env python
+#
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Verifies that Google Test warns the user when not initialized properly."""
+
+__author__ = '[email protected] (Zhanyong Wan)'
+
+import gtest_test_utils
+
+
+COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_uninitialized_test_')
+
+
+def Assert(condition):
+  if not condition:
+    raise AssertionError
+
+
+def AssertEq(expected, actual):
+  if expected != actual:
+    print 'Expected: %s' % (expected,)
+    print '  Actual: %s' % (actual,)
+    raise AssertionError
+
+
+def TestExitCodeAndOutput(command):
+  """Runs the given command and verifies its exit code and output."""
+
+  # Verifies that 'command' exits with code 1.
+  p = gtest_test_utils.Subprocess(command)
+  Assert(p.exited)
+  AssertEq(1, p.exit_code)
+  Assert('InitGoogleTest' in p.output)
+
+
+class GTestUninitializedTest(gtest_test_utils.TestCase):
+  def testExitCodeAndOutput(self):
+    TestExitCodeAndOutput(COMMAND)
+
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_outfiles_test.py b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_outfiles_test.py
index c50201fd..0fe947f0 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_outfiles_test.py
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_outfiles_test.py
@@ -1,132 +1,132 @@
-#!/usr/bin/env python

-#

-# Copyright 2008, Google Inc.

-# All rights reserved.

-#

-# Redistribution and use in source and binary forms, with or without

-# modification, are permitted provided that the following conditions are

-# met:

-#

-#     * Redistributions of source code must retain the above copyright

-# notice, this list of conditions and the following disclaimer.

-#     * Redistributions in binary form must reproduce the above

-# copyright notice, this list of conditions and the following disclaimer

-# in the documentation and/or other materials provided with the

-# distribution.

-#     * Neither the name of Google Inc. nor the names of its

-# contributors may be used to endorse or promote products derived from

-# this software without specific prior written permission.

-#

-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-"""Unit test for the gtest_xml_output module."""

-

-__author__ = "[email protected] (Keith Ray)"

-

-import os

-from xml.dom import minidom, Node

-

-import gtest_test_utils

-import gtest_xml_test_utils

-

-

-GTEST_OUTPUT_SUBDIR = "xml_outfiles"

-GTEST_OUTPUT_1_TEST = "gtest_xml_outfile1_test_"

-GTEST_OUTPUT_2_TEST = "gtest_xml_outfile2_test_"

-

-EXPECTED_XML_1 = """<?xml version="1.0" encoding="UTF-8"?>

-<testsuites tests="1" failures="0" disabled="0" errors="0" time="*" name="AllTests">

-  <testsuite name="PropertyOne" tests="1" failures="0" disabled="0" errors="0" time="*">

-    <testcase name="TestSomeProperties" status="run" time="*" classname="PropertyOne" SetUpProp="1" TestSomeProperty="1" TearDownProp="1" />

-  </testsuite>

-</testsuites>

-"""

-

-EXPECTED_XML_2 = """<?xml version="1.0" encoding="UTF-8"?>

-<testsuites tests="1" failures="0" disabled="0" errors="0" time="*" name="AllTests">

-  <testsuite name="PropertyTwo" tests="1" failures="0" disabled="0" errors="0" time="*">

-    <testcase name="TestSomeProperties" status="run" time="*" classname="PropertyTwo" SetUpProp="2" TestSomeProperty="2" TearDownProp="2" />

-  </testsuite>

-</testsuites>

-"""

-

-

-class GTestXMLOutFilesTest(gtest_xml_test_utils.GTestXMLTestCase):

-  """Unit test for Google Test's XML output functionality."""

-

-  def setUp(self):

-    # We want the trailing '/' that the last "" provides in os.path.join, for

-    # telling Google Test to create an output directory instead of a single file

-    # for xml output.

-    self.output_dir_ = os.path.join(gtest_test_utils.GetTempDir(),

-                                    GTEST_OUTPUT_SUBDIR, "")

-    self.DeleteFilesAndDir()

-

-  def tearDown(self):

-    self.DeleteFilesAndDir()

-

-  def DeleteFilesAndDir(self):

-    try:

-      os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_1_TEST + ".xml"))

-    except os.error:

-      pass

-    try:

-      os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_2_TEST + ".xml"))

-    except os.error:

-      pass

-    try:

-      os.rmdir(self.output_dir_)

-    except os.error:

-      pass

-

-  def testOutfile1(self):

-    self._TestOutFile(GTEST_OUTPUT_1_TEST, EXPECTED_XML_1)

-

-  def testOutfile2(self):

-    self._TestOutFile(GTEST_OUTPUT_2_TEST, EXPECTED_XML_2)

-

-  def _TestOutFile(self, test_name, expected_xml):

-    gtest_prog_path = gtest_test_utils.GetTestExecutablePath(test_name)

-    command = [gtest_prog_path, "--gtest_output=xml:%s" % self.output_dir_]

-    p = gtest_test_utils.Subprocess(command,

-                                    working_dir=gtest_test_utils.GetTempDir())

-    self.assert_(p.exited)

-    self.assertEquals(0, p.exit_code)

-

-    # TODO([email protected]): libtool causes the built test binary to be

-    #   named lt-gtest_xml_outfiles_test_ instead of

-    #   gtest_xml_outfiles_test_.  To account for this possibillity, we

-    #   allow both names in the following code.  We should remove this

-    #   hack when Chandler Carruth's libtool replacement tool is ready.

-    output_file_name1 = test_name + ".xml"

-    output_file1 = os.path.join(self.output_dir_, output_file_name1)

-    output_file_name2 = 'lt-' + output_file_name1

-    output_file2 = os.path.join(self.output_dir_, output_file_name2)

-    self.assert_(os.path.isfile(output_file1) or os.path.isfile(output_file2),

-                 output_file1)

-

-    expected = minidom.parseString(expected_xml)

-    if os.path.isfile(output_file1):

-      actual = minidom.parse(output_file1)

-    else:

-      actual = minidom.parse(output_file2)

-    self.NormalizeXml(actual.documentElement)

-    self.AssertEquivalentNodes(expected.documentElement,

-                               actual.documentElement)

-    expected.unlink()

-    actual.unlink()

-

-

-if __name__ == "__main__":

-  os.environ["GTEST_STACK_TRACE_DEPTH"] = "0"

-  gtest_test_utils.Main()

+#!/usr/bin/env python
+#
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Unit test for the gtest_xml_output module."""
+
+__author__ = "[email protected] (Keith Ray)"
+
+import os
+from xml.dom import minidom, Node
+
+import gtest_test_utils
+import gtest_xml_test_utils
+
+
+GTEST_OUTPUT_SUBDIR = "xml_outfiles"
+GTEST_OUTPUT_1_TEST = "gtest_xml_outfile1_test_"
+GTEST_OUTPUT_2_TEST = "gtest_xml_outfile2_test_"
+
+EXPECTED_XML_1 = """<?xml version="1.0" encoding="UTF-8"?>
+<testsuites tests="1" failures="0" disabled="0" errors="0" time="*" name="AllTests">
+  <testsuite name="PropertyOne" tests="1" failures="0" disabled="0" errors="0" time="*">
+    <testcase name="TestSomeProperties" status="run" time="*" classname="PropertyOne" SetUpProp="1" TestSomeProperty="1" TearDownProp="1" />
+  </testsuite>
+</testsuites>
+"""
+
+EXPECTED_XML_2 = """<?xml version="1.0" encoding="UTF-8"?>
+<testsuites tests="1" failures="0" disabled="0" errors="0" time="*" name="AllTests">
+  <testsuite name="PropertyTwo" tests="1" failures="0" disabled="0" errors="0" time="*">
+    <testcase name="TestSomeProperties" status="run" time="*" classname="PropertyTwo" SetUpProp="2" TestSomeProperty="2" TearDownProp="2" />
+  </testsuite>
+</testsuites>
+"""
+
+
+class GTestXMLOutFilesTest(gtest_xml_test_utils.GTestXMLTestCase):
+  """Unit test for Google Test's XML output functionality."""
+
+  def setUp(self):
+    # We want the trailing '/' that the last "" provides in os.path.join, for
+    # telling Google Test to create an output directory instead of a single file
+    # for xml output.
+    self.output_dir_ = os.path.join(gtest_test_utils.GetTempDir(),
+                                    GTEST_OUTPUT_SUBDIR, "")
+    self.DeleteFilesAndDir()
+
+  def tearDown(self):
+    self.DeleteFilesAndDir()
+
+  def DeleteFilesAndDir(self):
+    try:
+      os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_1_TEST + ".xml"))
+    except os.error:
+      pass
+    try:
+      os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_2_TEST + ".xml"))
+    except os.error:
+      pass
+    try:
+      os.rmdir(self.output_dir_)
+    except os.error:
+      pass
+
+  def testOutfile1(self):
+    self._TestOutFile(GTEST_OUTPUT_1_TEST, EXPECTED_XML_1)
+
+  def testOutfile2(self):
+    self._TestOutFile(GTEST_OUTPUT_2_TEST, EXPECTED_XML_2)
+
+  def _TestOutFile(self, test_name, expected_xml):
+    gtest_prog_path = gtest_test_utils.GetTestExecutablePath(test_name)
+    command = [gtest_prog_path, "--gtest_output=xml:%s" % self.output_dir_]
+    p = gtest_test_utils.Subprocess(command,
+                                    working_dir=gtest_test_utils.GetTempDir())
+    self.assert_(p.exited)
+    self.assertEquals(0, p.exit_code)
+
+    # TODO([email protected]): libtool causes the built test binary to be
+    #   named lt-gtest_xml_outfiles_test_ instead of
+    #   gtest_xml_outfiles_test_.  To account for this possibillity, we
+    #   allow both names in the following code.  We should remove this
+    #   hack when Chandler Carruth's libtool replacement tool is ready.
+    output_file_name1 = test_name + ".xml"
+    output_file1 = os.path.join(self.output_dir_, output_file_name1)
+    output_file_name2 = 'lt-' + output_file_name1
+    output_file2 = os.path.join(self.output_dir_, output_file_name2)
+    self.assert_(os.path.isfile(output_file1) or os.path.isfile(output_file2),
+                 output_file1)
+
+    expected = minidom.parseString(expected_xml)
+    if os.path.isfile(output_file1):
+      actual = minidom.parse(output_file1)
+    else:
+      actual = minidom.parse(output_file2)
+    self.NormalizeXml(actual.documentElement)
+    self.AssertEquivalentNodes(expected.documentElement,
+                               actual.documentElement)
+    expected.unlink()
+    actual.unlink()
+
+
+if __name__ == "__main__":
+  os.environ["GTEST_STACK_TRACE_DEPTH"] = "0"
+  gtest_test_utils.Main()
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_output_unittest.py b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_output_unittest.py
index be2b77a0..6d44929c 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_output_unittest.py
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_output_unittest.py
@@ -1,224 +1,224 @@
-#!/usr/bin/env python

-#

-# Copyright 2006, Google Inc.

-# All rights reserved.

-#

-# Redistribution and use in source and binary forms, with or without

-# modification, are permitted provided that the following conditions are

-# met:

-#

-#     * Redistributions of source code must retain the above copyright

-# notice, this list of conditions and the following disclaimer.

-#     * Redistributions in binary form must reproduce the above

-# copyright notice, this list of conditions and the following disclaimer

-# in the documentation and/or other materials provided with the

-# distribution.

-#     * Neither the name of Google Inc. nor the names of its

-# contributors may be used to endorse or promote products derived from

-# this software without specific prior written permission.

-#

-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-"""Unit test for the gtest_xml_output module"""

-

-__author__ = '[email protected] (Sean Mcafee)'

-

-import errno

-import os

-import sys

-from xml.dom import minidom, Node

-

-import gtest_test_utils

-import gtest_xml_test_utils

-

-

-GTEST_OUTPUT_FLAG         = "--gtest_output"

-GTEST_DEFAULT_OUTPUT_FILE = "test_detail.xml"

-GTEST_PROGRAM_NAME = "gtest_xml_output_unittest_"

-

-SUPPORTS_STACK_TRACES = False

-

-if SUPPORTS_STACK_TRACES:

-  STACK_TRACE_TEMPLATE = "\nStack trace:\n*"

-else:

-  STACK_TRACE_TEMPLATE = ""

-

-EXPECTED_NON_EMPTY_XML = """<?xml version="1.0" encoding="UTF-8"?>

-<testsuites tests="15" failures="4" disabled="2" errors="0" time="*" name="AllTests">

-  <testsuite name="SuccessfulTest" tests="1" failures="0" disabled="0" errors="0" time="*">

-    <testcase name="Succeeds" status="run" time="*" classname="SuccessfulTest"/>

-  </testsuite>

-  <testsuite name="FailedTest" tests="1" failures="1" disabled="0" errors="0" time="*">

-    <testcase name="Fails" status="run" time="*" classname="FailedTest">

-      <failure message="Value of: 2&#x0A;Expected: 1" type=""><![CDATA[gtest_xml_output_unittest_.cc:*

-Value of: 2

-Expected: 1%(stack)s]]></failure>

-    </testcase>

-  </testsuite>

-  <testsuite name="MixedResultTest" tests="3" failures="1" disabled="1" errors="0" time="*">

-    <testcase name="Succeeds" status="run" time="*" classname="MixedResultTest"/>

-    <testcase name="Fails" status="run" time="*" classname="MixedResultTest">

-      <failure message="Value of: 2&#x0A;Expected: 1" type=""><![CDATA[gtest_xml_output_unittest_.cc:*

-Value of: 2

-Expected: 1%(stack)s]]></failure>

-      <failure message="Value of: 3&#x0A;Expected: 2" type=""><![CDATA[gtest_xml_output_unittest_.cc:*

-Value of: 3

-Expected: 2%(stack)s]]></failure>

-    </testcase>

-    <testcase name="DISABLED_test" status="notrun" time="*" classname="MixedResultTest"/>

-  </testsuite>

-  <testsuite name="XmlQuotingTest" tests="1" failures="1" disabled="0" errors="0" time="*">

-    <testcase name="OutputsCData" status="run" time="*" classname="XmlQuotingTest">

-      <failure message="Failed&#x0A;XML output: &lt;?xml encoding=&quot;utf-8&quot;&gt;&lt;top&gt;&lt;![CDATA[cdata text]]&gt;&lt;/top&gt;" type=""><![CDATA[gtest_xml_output_unittest_.cc:*

-Failed

-XML output: <?xml encoding="utf-8"><top><![CDATA[cdata text]]>]]&gt;<![CDATA[</top>%(stack)s]]></failure>

-    </testcase>

-  </testsuite>

-  <testsuite name="InvalidCharactersTest" tests="1" failures="1" disabled="0" errors="0" time="*">

-    <testcase name="InvalidCharactersInMessage" status="run" time="*" classname="InvalidCharactersTest">

-      <failure message="Failed&#x0A;Invalid characters in brackets []" type=""><![CDATA[gtest_xml_output_unittest_.cc:*

-Failed

-Invalid characters in brackets []%(stack)s]]></failure>

-    </testcase>

-  </testsuite>

-  <testsuite name="DisabledTest" tests="1" failures="0" disabled="1" errors="0" time="*">

-    <testcase name="DISABLED_test_not_run" status="notrun" time="*" classname="DisabledTest"/>

-  </testsuite>

-  <testsuite name="PropertyRecordingTest" tests="4" failures="0" disabled="0" errors="0" time="*">

-    <testcase name="OneProperty" status="run" time="*" classname="PropertyRecordingTest" key_1="1"/>

-    <testcase name="IntValuedProperty" status="run" time="*" classname="PropertyRecordingTest" key_int="1"/>

-    <testcase name="ThreeProperties" status="run" time="*" classname="PropertyRecordingTest" key_1="1" key_2="2" key_3="3"/>

-    <testcase name="TwoValuesForOneKeyUsesLastValue" status="run" time="*" classname="PropertyRecordingTest" key_1="2"/>

-  </testsuite>

-  <testsuite name="NoFixtureTest" tests="3" failures="0" disabled="0" errors="0" time="*">

-     <testcase name="RecordProperty" status="run" time="*" classname="NoFixtureTest" key="1"/>

-     <testcase name="ExternalUtilityThatCallsRecordIntValuedProperty" status="run" time="*" classname="NoFixtureTest" key_for_utility_int="1"/>

-     <testcase name="ExternalUtilityThatCallsRecordStringValuedProperty" status="run" time="*" classname="NoFixtureTest" key_for_utility_string="1"/>

-  </testsuite>

-</testsuites>""" % {'stack': STACK_TRACE_TEMPLATE}

-

-

-EXPECTED_EMPTY_XML = """<?xml version="1.0" encoding="UTF-8"?>

-<testsuites tests="0" failures="0" disabled="0" errors="0" time="*" name="AllTests">

-</testsuites>"""

-

-

-class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase):

-  """

-  Unit test for Google Test's XML output functionality.

-  """

-

-  def testNonEmptyXmlOutput(self):

-    """

-    Runs a test program that generates a non-empty XML output, and

-    tests that the XML output is expected.

-    """

-    self._TestXmlOutput(GTEST_PROGRAM_NAME, EXPECTED_NON_EMPTY_XML, 1)

-

-  def testEmptyXmlOutput(self):

-    """

-    Runs a test program that generates an empty XML output, and

-    tests that the XML output is expected.

-    """

-

-    self._TestXmlOutput("gtest_no_test_unittest",

-                        EXPECTED_EMPTY_XML, 0)

-

-  def testDefaultOutputFile(self):

-    """

-    Confirms that Google Test produces an XML output file with the expected

-    default name if no name is explicitly specified.

-    """

-    output_file = os.path.join(gtest_test_utils.GetTempDir(),

-                               GTEST_DEFAULT_OUTPUT_FILE)

-    gtest_prog_path = gtest_test_utils.GetTestExecutablePath(

-        "gtest_no_test_unittest")

-    try:

-      os.remove(output_file)

-    except OSError, e:

-      if e.errno != errno.ENOENT:

-        raise

-

-    p = gtest_test_utils.Subprocess(

-        [gtest_prog_path, "%s=xml" % GTEST_OUTPUT_FLAG],

-        working_dir=gtest_test_utils.GetTempDir())

-    self.assert_(p.exited)

-    self.assertEquals(0, p.exit_code)

-    self.assert_(os.path.isfile(output_file))

-

-  def testSuppressedXmlOutput(self):

-    """

-    Tests that no XML file is generated if the default XML listener is

-    shut down before RUN_ALL_TESTS is invoked.

-    """

-

-    xml_path = os.path.join(gtest_test_utils.GetTempDir(),

-                            GTEST_PROGRAM_NAME + "out.xml")

-    if os.path.isfile(xml_path):

-      os.remove(xml_path)

-

-    gtest_prog_path = gtest_test_utils.GetTestExecutablePath(GTEST_PROGRAM_NAME)

-

-    command = [gtest_prog_path,

-               "%s=xml:%s" % (GTEST_OUTPUT_FLAG, xml_path),

-               "--shut_down_xml"]

-    p = gtest_test_utils.Subprocess(command)

-    if p.terminated_by_signal:

-      self.assert_(False,

-                   "%s was killed by signal %d" % (gtest_prog_name, p.signal))

-    else:

-      self.assert_(p.exited)

-      self.assertEquals(1, p.exit_code,

-                        "'%s' exited with code %s, which doesn't match "

-                        "the expected exit code %s."

-                        % (command, p.exit_code, 1))

-

-    self.assert_(not os.path.isfile(xml_path))

-

-

-  def _TestXmlOutput(self, gtest_prog_name, expected_xml, expected_exit_code):

-    """

-    Asserts that the XML document generated by running the program

-    gtest_prog_name matches expected_xml, a string containing another

-    XML document.  Furthermore, the program's exit code must be

-    expected_exit_code.

-    """

-    xml_path = os.path.join(gtest_test_utils.GetTempDir(),

-                            gtest_prog_name + "out.xml")

-    gtest_prog_path = gtest_test_utils.GetTestExecutablePath(gtest_prog_name)

-

-    command = [gtest_prog_path, "%s=xml:%s" % (GTEST_OUTPUT_FLAG, xml_path)]

-    p = gtest_test_utils.Subprocess(command)

-    if p.terminated_by_signal:

-      self.assert_(False,

-                   "%s was killed by signal %d" % (gtest_prog_name, p.signal))

-    else:

-      self.assert_(p.exited)

-      self.assertEquals(expected_exit_code, p.exit_code,

-                        "'%s' exited with code %s, which doesn't match "

-                        "the expected exit code %s."

-                        % (command, p.exit_code, expected_exit_code))

-

-    expected = minidom.parseString(expected_xml)

-    actual   = minidom.parse(xml_path)

-    self.NormalizeXml(actual.documentElement)

-    self.AssertEquivalentNodes(expected.documentElement,

-                               actual.documentElement)

-    expected.unlink()

-    actual  .unlink()

-

-

-

-if __name__ == '__main__':

-  os.environ['GTEST_STACK_TRACE_DEPTH'] = '1'

-  gtest_test_utils.Main()

+#!/usr/bin/env python
+#
+# Copyright 2006, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Unit test for the gtest_xml_output module"""
+
+__author__ = '[email protected] (Sean Mcafee)'
+
+import errno
+import os
+import sys
+from xml.dom import minidom, Node
+
+import gtest_test_utils
+import gtest_xml_test_utils
+
+
+GTEST_OUTPUT_FLAG         = "--gtest_output"
+GTEST_DEFAULT_OUTPUT_FILE = "test_detail.xml"
+GTEST_PROGRAM_NAME = "gtest_xml_output_unittest_"
+
+SUPPORTS_STACK_TRACES = False
+
+if SUPPORTS_STACK_TRACES:
+  STACK_TRACE_TEMPLATE = "\nStack trace:\n*"
+else:
+  STACK_TRACE_TEMPLATE = ""
+
+EXPECTED_NON_EMPTY_XML = """<?xml version="1.0" encoding="UTF-8"?>
+<testsuites tests="15" failures="4" disabled="2" errors="0" time="*" name="AllTests">
+  <testsuite name="SuccessfulTest" tests="1" failures="0" disabled="0" errors="0" time="*">
+    <testcase name="Succeeds" status="run" time="*" classname="SuccessfulTest"/>
+  </testsuite>
+  <testsuite name="FailedTest" tests="1" failures="1" disabled="0" errors="0" time="*">
+    <testcase name="Fails" status="run" time="*" classname="FailedTest">
+      <failure message="Value of: 2&#x0A;Expected: 1" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
+Value of: 2
+Expected: 1%(stack)s]]></failure>
+    </testcase>
+  </testsuite>
+  <testsuite name="MixedResultTest" tests="3" failures="1" disabled="1" errors="0" time="*">
+    <testcase name="Succeeds" status="run" time="*" classname="MixedResultTest"/>
+    <testcase name="Fails" status="run" time="*" classname="MixedResultTest">
+      <failure message="Value of: 2&#x0A;Expected: 1" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
+Value of: 2
+Expected: 1%(stack)s]]></failure>
+      <failure message="Value of: 3&#x0A;Expected: 2" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
+Value of: 3
+Expected: 2%(stack)s]]></failure>
+    </testcase>
+    <testcase name="DISABLED_test" status="notrun" time="*" classname="MixedResultTest"/>
+  </testsuite>
+  <testsuite name="XmlQuotingTest" tests="1" failures="1" disabled="0" errors="0" time="*">
+    <testcase name="OutputsCData" status="run" time="*" classname="XmlQuotingTest">
+      <failure message="Failed&#x0A;XML output: &lt;?xml encoding=&quot;utf-8&quot;&gt;&lt;top&gt;&lt;![CDATA[cdata text]]&gt;&lt;/top&gt;" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
+Failed
+XML output: <?xml encoding="utf-8"><top><![CDATA[cdata text]]>]]&gt;<![CDATA[</top>%(stack)s]]></failure>
+    </testcase>
+  </testsuite>
+  <testsuite name="InvalidCharactersTest" tests="1" failures="1" disabled="0" errors="0" time="*">
+    <testcase name="InvalidCharactersInMessage" status="run" time="*" classname="InvalidCharactersTest">
+      <failure message="Failed&#x0A;Invalid characters in brackets []" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
+Failed
+Invalid characters in brackets []%(stack)s]]></failure>
+    </testcase>
+  </testsuite>
+  <testsuite name="DisabledTest" tests="1" failures="0" disabled="1" errors="0" time="*">
+    <testcase name="DISABLED_test_not_run" status="notrun" time="*" classname="DisabledTest"/>
+  </testsuite>
+  <testsuite name="PropertyRecordingTest" tests="4" failures="0" disabled="0" errors="0" time="*">
+    <testcase name="OneProperty" status="run" time="*" classname="PropertyRecordingTest" key_1="1"/>
+    <testcase name="IntValuedProperty" status="run" time="*" classname="PropertyRecordingTest" key_int="1"/>
+    <testcase name="ThreeProperties" status="run" time="*" classname="PropertyRecordingTest" key_1="1" key_2="2" key_3="3"/>
+    <testcase name="TwoValuesForOneKeyUsesLastValue" status="run" time="*" classname="PropertyRecordingTest" key_1="2"/>
+  </testsuite>
+  <testsuite name="NoFixtureTest" tests="3" failures="0" disabled="0" errors="0" time="*">
+     <testcase name="RecordProperty" status="run" time="*" classname="NoFixtureTest" key="1"/>
+     <testcase name="ExternalUtilityThatCallsRecordIntValuedProperty" status="run" time="*" classname="NoFixtureTest" key_for_utility_int="1"/>
+     <testcase name="ExternalUtilityThatCallsRecordStringValuedProperty" status="run" time="*" classname="NoFixtureTest" key_for_utility_string="1"/>
+  </testsuite>
+</testsuites>""" % {'stack': STACK_TRACE_TEMPLATE}
+
+
+EXPECTED_EMPTY_XML = """<?xml version="1.0" encoding="UTF-8"?>
+<testsuites tests="0" failures="0" disabled="0" errors="0" time="*" name="AllTests">
+</testsuites>"""
+
+
+class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase):
+  """
+  Unit test for Google Test's XML output functionality.
+  """
+
+  def testNonEmptyXmlOutput(self):
+    """
+    Runs a test program that generates a non-empty XML output, and
+    tests that the XML output is expected.
+    """
+    self._TestXmlOutput(GTEST_PROGRAM_NAME, EXPECTED_NON_EMPTY_XML, 1)
+
+  def testEmptyXmlOutput(self):
+    """
+    Runs a test program that generates an empty XML output, and
+    tests that the XML output is expected.
+    """
+
+    self._TestXmlOutput("gtest_no_test_unittest",
+                        EXPECTED_EMPTY_XML, 0)
+
+  def testDefaultOutputFile(self):
+    """
+    Confirms that Google Test produces an XML output file with the expected
+    default name if no name is explicitly specified.
+    """
+    output_file = os.path.join(gtest_test_utils.GetTempDir(),
+                               GTEST_DEFAULT_OUTPUT_FILE)
+    gtest_prog_path = gtest_test_utils.GetTestExecutablePath(
+        "gtest_no_test_unittest")
+    try:
+      os.remove(output_file)
+    except OSError, e:
+      if e.errno != errno.ENOENT:
+        raise
+
+    p = gtest_test_utils.Subprocess(
+        [gtest_prog_path, "%s=xml" % GTEST_OUTPUT_FLAG],
+        working_dir=gtest_test_utils.GetTempDir())
+    self.assert_(p.exited)
+    self.assertEquals(0, p.exit_code)
+    self.assert_(os.path.isfile(output_file))
+
+  def testSuppressedXmlOutput(self):
+    """
+    Tests that no XML file is generated if the default XML listener is
+    shut down before RUN_ALL_TESTS is invoked.
+    """
+
+    xml_path = os.path.join(gtest_test_utils.GetTempDir(),
+                            GTEST_PROGRAM_NAME + "out.xml")
+    if os.path.isfile(xml_path):
+      os.remove(xml_path)
+
+    gtest_prog_path = gtest_test_utils.GetTestExecutablePath(GTEST_PROGRAM_NAME)
+
+    command = [gtest_prog_path,
+               "%s=xml:%s" % (GTEST_OUTPUT_FLAG, xml_path),
+               "--shut_down_xml"]
+    p = gtest_test_utils.Subprocess(command)
+    if p.terminated_by_signal:
+      self.assert_(False,
+                   "%s was killed by signal %d" % (gtest_prog_name, p.signal))
+    else:
+      self.assert_(p.exited)
+      self.assertEquals(1, p.exit_code,
+                        "'%s' exited with code %s, which doesn't match "
+                        "the expected exit code %s."
+                        % (command, p.exit_code, 1))
+
+    self.assert_(not os.path.isfile(xml_path))
+
+
+  def _TestXmlOutput(self, gtest_prog_name, expected_xml, expected_exit_code):
+    """
+    Asserts that the XML document generated by running the program
+    gtest_prog_name matches expected_xml, a string containing another
+    XML document.  Furthermore, the program's exit code must be
+    expected_exit_code.
+    """
+    xml_path = os.path.join(gtest_test_utils.GetTempDir(),
+                            gtest_prog_name + "out.xml")
+    gtest_prog_path = gtest_test_utils.GetTestExecutablePath(gtest_prog_name)
+
+    command = [gtest_prog_path, "%s=xml:%s" % (GTEST_OUTPUT_FLAG, xml_path)]
+    p = gtest_test_utils.Subprocess(command)
+    if p.terminated_by_signal:
+      self.assert_(False,
+                   "%s was killed by signal %d" % (gtest_prog_name, p.signal))
+    else:
+      self.assert_(p.exited)
+      self.assertEquals(expected_exit_code, p.exit_code,
+                        "'%s' exited with code %s, which doesn't match "
+                        "the expected exit code %s."
+                        % (command, p.exit_code, expected_exit_code))
+
+    expected = minidom.parseString(expected_xml)
+    actual   = minidom.parse(xml_path)
+    self.NormalizeXml(actual.documentElement)
+    self.AssertEquivalentNodes(expected.documentElement,
+                               actual.documentElement)
+    expected.unlink()
+    actual  .unlink()
+
+
+
+if __name__ == '__main__':
+  os.environ['GTEST_STACK_TRACE_DEPTH'] = '1'
+  gtest_test_utils.Main()
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_test_utils.py b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_test_utils.py
index cc0e26ce..c83c3b7e 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_test_utils.py
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_test_utils.py
@@ -1,172 +1,172 @@
-#!/usr/bin/env python

-#

-# Copyright 2006, Google Inc.

-# All rights reserved.

-#

-# Redistribution and use in source and binary forms, with or without

-# modification, are permitted provided that the following conditions are

-# met:

-#

-#     * Redistributions of source code must retain the above copyright

-# notice, this list of conditions and the following disclaimer.

-#     * Redistributions in binary form must reproduce the above

-# copyright notice, this list of conditions and the following disclaimer

-# in the documentation and/or other materials provided with the

-# distribution.

-#     * Neither the name of Google Inc. nor the names of its

-# contributors may be used to endorse or promote products derived from

-# this software without specific prior written permission.

-#

-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-"""Unit test utilities for gtest_xml_output"""

-

-__author__ = '[email protected] (Sean Mcafee)'

-

-import re

-from xml.dom import minidom, Node

-

-import gtest_test_utils

-

-

-GTEST_OUTPUT_FLAG         = "--gtest_output"

-GTEST_DEFAULT_OUTPUT_FILE = "test_detail.xml"

-

-class GTestXMLTestCase(gtest_test_utils.TestCase):

-  """

-  Base class for tests of Google Test's XML output functionality.

-  """

-

-

-  def AssertEquivalentNodes(self, expected_node, actual_node):

-    """

-    Asserts that actual_node (a DOM node object) is equivalent to

-    expected_node (another DOM node object), in that either both of

-    them are CDATA nodes and have the same value, or both are DOM

-    elements and actual_node meets all of the following conditions:

-

-    *  It has the same tag name as expected_node.

-    *  It has the same set of attributes as expected_node, each with

-       the same value as the corresponding attribute of expected_node.

-       An exception is any attribute named "time", which needs only be

-       convertible to a floating-point number.

-    *  It has an equivalent set of child nodes (including elements and

-       CDATA sections) as expected_node.  Note that we ignore the

-       order of the children as they are not guaranteed to be in any

-       particular order.

-    """

-

-    if expected_node.nodeType == Node.CDATA_SECTION_NODE:

-      self.assertEquals(Node.CDATA_SECTION_NODE, actual_node.nodeType)

-      self.assertEquals(expected_node.nodeValue, actual_node.nodeValue)

-      return

-

-    self.assertEquals(Node.ELEMENT_NODE, actual_node.nodeType)

-    self.assertEquals(Node.ELEMENT_NODE, expected_node.nodeType)

-    self.assertEquals(expected_node.tagName, actual_node.tagName)

-

-    expected_attributes = expected_node.attributes

-    actual_attributes   = actual_node  .attributes

-    self.assertEquals(

-        expected_attributes.length, actual_attributes.length,

-        "attribute numbers differ in element " + actual_node.tagName)

-    for i in range(expected_attributes.length):

-      expected_attr = expected_attributes.item(i)

-      actual_attr   = actual_attributes.get(expected_attr.name)

-      self.assert_(

-          actual_attr is not None,

-          "expected attribute %s not found in element %s" %

-          (expected_attr.name, actual_node.tagName))

-      self.assertEquals(expected_attr.value, actual_attr.value,

-                        " values of attribute %s in element %s differ" %

-                        (expected_attr.name, actual_node.tagName))

-

-    expected_children = self._GetChildren(expected_node)

-    actual_children = self._GetChildren(actual_node)

-    self.assertEquals(

-        len(expected_children), len(actual_children),

-        "number of child elements differ in element " + actual_node.tagName)

-    for child_id, child in expected_children.iteritems():

-      self.assert_(child_id in actual_children,

-                   '<%s> is not in <%s> (in element %s)' %

-                   (child_id, actual_children, actual_node.tagName))

-      self.AssertEquivalentNodes(child, actual_children[child_id])

-

-  identifying_attribute = {

-    "testsuites": "name",

-    "testsuite": "name",

-    "testcase":  "name",

-    "failure":   "message",

-    }

-

-  def _GetChildren(self, element):

-    """

-    Fetches all of the child nodes of element, a DOM Element object.

-    Returns them as the values of a dictionary keyed by the IDs of the

-    children.  For <testsuites>, <testsuite> and <testcase> elements, the ID

-    is the value of their "name" attribute; for <failure> elements, it is

-    the value of the "message" attribute; CDATA sections and non-whitespace

-    text nodes are concatenated into a single CDATA section with ID

-    "detail".  An exception is raised if any element other than the above

-    four is encountered, if two child elements with the same identifying

-    attributes are encountered, or if any other type of node is encountered.

-    """

-

-    children = {}

-    for child in element.childNodes:

-      if child.nodeType == Node.ELEMENT_NODE:

-        self.assert_(child.tagName in self.identifying_attribute,

-                     "Encountered unknown element <%s>" % child.tagName)

-        childID = child.getAttribute(self.identifying_attribute[child.tagName])

-        self.assert_(childID not in children)

-        children[childID] = child

-      elif child.nodeType in [Node.TEXT_NODE, Node.CDATA_SECTION_NODE]:

-        if "detail" not in children:

-          if (child.nodeType == Node.CDATA_SECTION_NODE or

-              not child.nodeValue.isspace()):

-            children["detail"] = child.ownerDocument.createCDATASection(

-                child.nodeValue)

-        else:

-          children["detail"].nodeValue += child.nodeValue

-      else:

-        self.fail("Encountered unexpected node type %d" % child.nodeType)

-    return children

-

-  def NormalizeXml(self, element):

-    """

-    Normalizes Google Test's XML output to eliminate references to transient

-    information that may change from run to run.

-

-    *  The "time" attribute of <testsuites>, <testsuite> and <testcase>

-       elements is replaced with a single asterisk, if it contains

-       only digit characters.

-    *  The line number reported in the first line of the "message"

-       attribute of <failure> elements is replaced with a single asterisk.

-    *  The directory names in file paths are removed.

-    *  The stack traces are removed.

-    """

-

-    if element.tagName in ("testsuites", "testsuite", "testcase"):

-      time = element.getAttributeNode("time")

-      time.value = re.sub(r"^\d+(\.\d+)?$", "*", time.value)

-    elif element.tagName == "failure":

-      for child in element.childNodes:

-        if child.nodeType == Node.CDATA_SECTION_NODE:

-          # Removes the source line number.

-          cdata = re.sub(r"^.*[/\\](.*:)\d+\n", "\\1*\n", child.nodeValue)

-          # Removes the actual stack trace.

-          child.nodeValue = re.sub(r"\nStack trace:\n(.|\n)*",

-                                   "", cdata)

-    for child in element.childNodes:

-      if child.nodeType == Node.ELEMENT_NODE:

-        self.NormalizeXml(child)

+#!/usr/bin/env python
+#
+# Copyright 2006, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Unit test utilities for gtest_xml_output"""
+
+__author__ = '[email protected] (Sean Mcafee)'
+
+import re
+from xml.dom import minidom, Node
+
+import gtest_test_utils
+
+
+GTEST_OUTPUT_FLAG         = "--gtest_output"
+GTEST_DEFAULT_OUTPUT_FILE = "test_detail.xml"
+
+class GTestXMLTestCase(gtest_test_utils.TestCase):
+  """
+  Base class for tests of Google Test's XML output functionality.
+  """
+
+
+  def AssertEquivalentNodes(self, expected_node, actual_node):
+    """
+    Asserts that actual_node (a DOM node object) is equivalent to
+    expected_node (another DOM node object), in that either both of
+    them are CDATA nodes and have the same value, or both are DOM
+    elements and actual_node meets all of the following conditions:
+
+    *  It has the same tag name as expected_node.
+    *  It has the same set of attributes as expected_node, each with
+       the same value as the corresponding attribute of expected_node.
+       An exception is any attribute named "time", which needs only be
+       convertible to a floating-point number.
+    *  It has an equivalent set of child nodes (including elements and
+       CDATA sections) as expected_node.  Note that we ignore the
+       order of the children as they are not guaranteed to be in any
+       particular order.
+    """
+
+    if expected_node.nodeType == Node.CDATA_SECTION_NODE:
+      self.assertEquals(Node.CDATA_SECTION_NODE, actual_node.nodeType)
+      self.assertEquals(expected_node.nodeValue, actual_node.nodeValue)
+      return
+
+    self.assertEquals(Node.ELEMENT_NODE, actual_node.nodeType)
+    self.assertEquals(Node.ELEMENT_NODE, expected_node.nodeType)
+    self.assertEquals(expected_node.tagName, actual_node.tagName)
+
+    expected_attributes = expected_node.attributes
+    actual_attributes   = actual_node  .attributes
+    self.assertEquals(
+        expected_attributes.length, actual_attributes.length,
+        "attribute numbers differ in element " + actual_node.tagName)
+    for i in range(expected_attributes.length):
+      expected_attr = expected_attributes.item(i)
+      actual_attr   = actual_attributes.get(expected_attr.name)
+      self.assert_(
+          actual_attr is not None,
+          "expected attribute %s not found in element %s" %
+          (expected_attr.name, actual_node.tagName))
+      self.assertEquals(expected_attr.value, actual_attr.value,
+                        " values of attribute %s in element %s differ" %
+                        (expected_attr.name, actual_node.tagName))
+
+    expected_children = self._GetChildren(expected_node)
+    actual_children = self._GetChildren(actual_node)
+    self.assertEquals(
+        len(expected_children), len(actual_children),
+        "number of child elements differ in element " + actual_node.tagName)
+    for child_id, child in expected_children.iteritems():
+      self.assert_(child_id in actual_children,
+                   '<%s> is not in <%s> (in element %s)' %
+                   (child_id, actual_children, actual_node.tagName))
+      self.AssertEquivalentNodes(child, actual_children[child_id])
+
+  identifying_attribute = {
+    "testsuites": "name",
+    "testsuite": "name",
+    "testcase":  "name",
+    "failure":   "message",
+    }
+
+  def _GetChildren(self, element):
+    """
+    Fetches all of the child nodes of element, a DOM Element object.
+    Returns them as the values of a dictionary keyed by the IDs of the
+    children.  For <testsuites>, <testsuite> and <testcase> elements, the ID
+    is the value of their "name" attribute; for <failure> elements, it is
+    the value of the "message" attribute; CDATA sections and non-whitespace
+    text nodes are concatenated into a single CDATA section with ID
+    "detail".  An exception is raised if any element other than the above
+    four is encountered, if two child elements with the same identifying
+    attributes are encountered, or if any other type of node is encountered.
+    """
+
+    children = {}
+    for child in element.childNodes:
+      if child.nodeType == Node.ELEMENT_NODE:
+        self.assert_(child.tagName in self.identifying_attribute,
+                     "Encountered unknown element <%s>" % child.tagName)
+        childID = child.getAttribute(self.identifying_attribute[child.tagName])
+        self.assert_(childID not in children)
+        children[childID] = child
+      elif child.nodeType in [Node.TEXT_NODE, Node.CDATA_SECTION_NODE]:
+        if "detail" not in children:
+          if (child.nodeType == Node.CDATA_SECTION_NODE or
+              not child.nodeValue.isspace()):
+            children["detail"] = child.ownerDocument.createCDATASection(
+                child.nodeValue)
+        else:
+          children["detail"].nodeValue += child.nodeValue
+      else:
+        self.fail("Encountered unexpected node type %d" % child.nodeType)
+    return children
+
+  def NormalizeXml(self, element):
+    """
+    Normalizes Google Test's XML output to eliminate references to transient
+    information that may change from run to run.
+
+    *  The "time" attribute of <testsuites>, <testsuite> and <testcase>
+       elements is replaced with a single asterisk, if it contains
+       only digit characters.
+    *  The line number reported in the first line of the "message"
+       attribute of <failure> elements is replaced with a single asterisk.
+    *  The directory names in file paths are removed.
+    *  The stack traces are removed.
+    """
+
+    if element.tagName in ("testsuites", "testsuite", "testcase"):
+      time = element.getAttributeNode("time")
+      time.value = re.sub(r"^\d+(\.\d+)?$", "*", time.value)
+    elif element.tagName == "failure":
+      for child in element.childNodes:
+        if child.nodeType == Node.CDATA_SECTION_NODE:
+          # Removes the source line number.
+          cdata = re.sub(r"^.*[/\\](.*:)\d+\n", "\\1*\n", child.nodeValue)
+          # Removes the actual stack trace.
+          child.nodeValue = re.sub(r"\nStack trace:\n(.|\n)*",
+                                   "", cdata)
+    for child in element.childNodes:
+      if child.nodeType == Node.ELEMENT_NODE:
+        self.NormalizeXml(child)
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/production.h b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/production.h
index 257fef05..59970da0 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/production.h
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/test/production.h
@@ -1,55 +1,55 @@
-// Copyright 2006, Google Inc.

-// All rights reserved.

-//

-// Redistribution and use in source and binary forms, with or without

-// modification, are permitted provided that the following conditions are

-// met:

-//

-//     * Redistributions of source code must retain the above copyright

-// notice, this list of conditions and the following disclaimer.

-//     * Redistributions in binary form must reproduce the above

-// copyright notice, this list of conditions and the following disclaimer

-// in the documentation and/or other materials provided with the

-// distribution.

-//     * Neither the name of Google Inc. nor the names of its

-// contributors may be used to endorse or promote products derived from

-// this software without specific prior written permission.

-//

-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-//

-// Author: [email protected] (Zhanyong Wan)

-//

-// This is part of the unit test for include/gtest/gtest_prod.h.

-

-#ifndef GTEST_TEST_PRODUCTION_H_

-#define GTEST_TEST_PRODUCTION_H_

-

-#include <gtest/gtest_prod.h>

-

-class PrivateCode {

- public:

-  // Declares a friend test that does not use a fixture.

-  FRIEND_TEST(PrivateCodeTest, CanAccessPrivateMembers);

-

-  // Declares a friend test that uses a fixture.

-  FRIEND_TEST(PrivateCodeFixtureTest, CanAccessPrivateMembers);

-

-  PrivateCode();

-

-  int x() const { return x_; }

- private:

-  void set_x(int x) { x_ = x; }

-  int x_;

-};

-

-#endif  // GTEST_TEST_PRODUCTION_H_

+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: [email protected] (Zhanyong Wan)
+//
+// This is part of the unit test for include/gtest/gtest_prod.h.
+
+#ifndef GTEST_TEST_PRODUCTION_H_
+#define GTEST_TEST_PRODUCTION_H_
+
+#include <gtest/gtest_prod.h>
+
+class PrivateCode {
+ public:
+  // Declares a friend test that does not use a fixture.
+  FRIEND_TEST(PrivateCodeTest, CanAccessPrivateMembers);
+
+  // Declares a friend test that uses a fixture.
+  FRIEND_TEST(PrivateCodeFixtureTest, CanAccessPrivateMembers);
+
+  PrivateCode();
+
+  int x() const { return x_; }
+ private:
+  void set_x(int x) { x_ = x; }
+  int x_;
+};
+
+#endif  // GTEST_TEST_PRODUCTION_H_