You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ka...@apache.org on 2016/04/07 18:49:58 UTC
mesos git commit: Fixed library lookup for Master detector/contender
module tests.
Repository: mesos
Updated Branches:
refs/heads/master a79261564 -> 0f2f17aaf
Fixed library lookup for Master detector/contender module tests.
Review: https://reviews.apache.org/r/45876
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0f2f17aa
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0f2f17aa
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0f2f17aa
Branch: refs/heads/master
Commit: 0f2f17aafdccb9c2645584453c0ff86d1425d14e
Parents: a792615
Author: Kapil Arya <ka...@mesosphere.io>
Authored: Thu Apr 7 12:37:48 2016 -0400
Committer: Kapil Arya <ka...@mesosphere.io>
Committed: Thu Apr 7 12:41:32 2016 -0400
----------------------------------------------------------------------
src/tests/module.cpp | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0f2f17aa/src/tests/module.cpp
----------------------------------------------------------------------
diff --git a/src/tests/module.cpp b/src/tests/module.cpp
index 4b24048..5b83fd6 100644
--- a/src/tests/module.cpp
+++ b/src/tests/module.cpp
@@ -226,15 +226,9 @@ static void addMasterContenderModules(Modules* modules)
{
CHECK_NOTNULL(modules);
- const string libraryPath = path::join(
- tests::flags.build_dir,
- "src",
- ".libs",
- os::libraries::expandName("testmastercontender"));
-
// Now add our test anonymous module.
Modules::Library* library = modules->add_libraries();
- library->set_file(libraryPath);
+ library->set_file(getModulePath("testmastercontender"));
// To add a new module from this library, create a new ModuleID enum
// and tie it with a module name.
@@ -249,15 +243,9 @@ static void addMasterDetectorModules(Modules* modules)
{
CHECK_NOTNULL(modules);
- const string libraryPath = path::join(
- tests::flags.build_dir,
- "src",
- ".libs",
- os::libraries::expandName("testmasterdetector"));
-
// Now add our test anonymous module.
Modules::Library* library = modules->add_libraries();
- library->set_file(libraryPath);
+ library->set_file(getModulePath("testmasterdetector"));
// To add a new module from this library, create a new ModuleID enum
// and tie it with a module name.