[2/2] mesos git commit: Removed workaround in ZooKeeper test.

[an...@apache.org]

Removed workaround in ZooKeeper test.

Now that `fs::list` returns the full path, this code can be fixed.

Review: https://reviews.apache.org/r/65398/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8e7afafb
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8e7afafb
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8e7afafb

Branch: refs/heads/master
Commit: 8e7afafb9056c04d2ff849011a9e8f79a2f9ce6a
Parents: e71ed38
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Authored: Tue Feb 6 14:48:33 2018 -0800
Committer: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Committed: Tue Feb 6 14:48:33 2018 -0800

----------------------------------------------------------------------
 src/tests/zookeeper.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/8e7afafb/src/tests/zookeeper.cpp
----------------------------------------------------------------------
diff --git a/src/tests/zookeeper.cpp b/src/tests/zookeeper.cpp
index 54cf9c6..722ea0b 100644
--- a/src/tests/zookeeper.cpp
+++ b/src/tests/zookeeper.cpp
@@ -72,12 +72,11 @@ void ZooKeeperTest::SetUpTestCase()
 
     foreach (const string& jar, jars.get()) {
 #ifdef __WINDOWS__
-      // TODO(andschwa): `fs::list` on Windows only returns the file names, not
-      // the full paths. Remove this work-around when MESOS-7803 is resolved.
-      classpath += ";" + path::join(zkHome, "lib", jar);
+      classpath += ";";
 #else
-      classpath += ":" + jar;
+      classpath += ":";
 #endif
+      classpath += jar;
     }
 
     LOG(INFO) << "Using Java classpath: " << classpath;