You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2018/05/09 18:40:01 UTC
mesos git commit: Windows: Enabled `ProtobufTest` suite.
Repository: mesos
Updated Branches:
refs/heads/master a6d0877b9 -> 6cf942a3e
Windows: Enabled `ProtobufTest` suite.
These tests just worked once added to the build. Also, out-of-date
code was deleted from `systems_tests.cpp`, and a note added to the
build file that it (and `signals_tests.cpp`) will be not be ported to
Windows.
Review: https://reviews.apache.org/r/67021
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6cf942a3
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6cf942a3
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6cf942a3
Branch: refs/heads/master
Commit: 6cf942a3ead959d7e096bbf4f4e3bf40a2e188fc
Parents: a6d0877
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Authored: Tue May 8 16:37:09 2018 -0700
Committer: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Committed: Wed May 9 11:39:20 2018 -0700
----------------------------------------------------------------------
3rdparty/stout/tests/CMakeLists.txt | 6 ++++--
3rdparty/stout/tests/os/systems_tests.cpp | 4 ----
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/6cf942a3/3rdparty/stout/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/CMakeLists.txt b/3rdparty/stout/tests/CMakeLists.txt
index 28674c9..43c5e87 100644
--- a/3rdparty/stout/tests/CMakeLists.txt
+++ b/3rdparty/stout/tests/CMakeLists.txt
@@ -43,6 +43,8 @@ set(STOUT_ROOT_TESTS_SRC
option_tests.cpp
os_tests.cpp
path_tests.cpp
+ protobuf_tests.cpp
+ protobuf_tests.pb.cc
protobuf_tests.pb.h
protobuf_tests.proto
recordio_tests.cpp
@@ -58,8 +60,6 @@ set(STOUT_ROOT_TESTS_SRC
if (NOT WIN32)
list(APPEND STOUT_ROOT_TESTS_SRC
- protobuf_tests.cpp
- protobuf_tests.pb.cc
svn_tests.cpp)
endif ()
@@ -75,6 +75,8 @@ set(STOUT_OS_TESTS_SRC
if (NOT WIN32)
list(APPEND STOUT_OS_TESTS_SRC
os/sendfile_tests.cpp
+ # NOTE: There is no intention to port the functions exercised in
+ # the following tests to Windows.
os/signals_tests.cpp
os/systems_tests.cpp)
endif ()
http://git-wip-us.apache.org/repos/asf/mesos/blob/6cf942a3/3rdparty/stout/tests/os/systems_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/os/systems_tests.cpp b/3rdparty/stout/tests/os/systems_tests.cpp
index a2a05ce..0862ba9 100644
--- a/3rdparty/stout/tests/os/systems_tests.cpp
+++ b/3rdparty/stout/tests/os/systems_tests.cpp
@@ -54,10 +54,6 @@ TEST_F(SystemsTests, Sysname)
EXPECT_EQ(name.get(), "Linux");
#elif defined(__APPLE__)
EXPECT_EQ(name.get(), "Darwin");
-#elif defined(__WINDOWS__)
- // On Windows, `sysname` is one of 2 options.
- hashset<string> server_types{ "Windows", "Windows Server" };
- EXPECT_TRUE(server_types.contains(name.get()));
#endif // __linux__
}