Repository: mesos Updated Branches: refs/heads/master 3cdbbc0df -> b1ae83704
Made shell test locale-independent. The test environment does not enforce that we run with a defined locale, so instead enforce it for our particular use case (here: potentially localized error messages from shell). Review: https://reviews.apache.org/r/39088 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b1ae8370 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b1ae8370 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b1ae8370 Branch: refs/heads/master Commit: b1ae83704e943eef5e01b06d625597268c056367 Parents: 3cdbbc0 Author: Benjamin Bannier <[email protected]> Authored: Wed Oct 14 11:13:03 2015 +0200 Committer: Till Toenshoff <[email protected]> Committed: Wed Oct 14 14:59:02 2015 +0200 ---------------------------------------------------------------------- 3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/b1ae8370/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp index e6d36ec..ee2a7a7 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp @@ -958,7 +958,7 @@ TEST_F(OsTest, Shell) // The `|| true`` necessary so that os::shell() sees a success // exit code and returns stdout (which we have piped stderr to). - result = os::shell("ls /tmp/foobar889076 2>&1 || true"); + result = os::shell("LC_ALL=C ls /tmp/foobar889076 2>&1 || true"); ASSERT_SOME(result); EXPECT_TRUE(strings::contains(result.get(), "No such file or directory"));
