diff options
author | Andrew Morrow <acm@mongodb.com> | 2015-07-12 16:48:12 -0400 |
---|---|---|
committer | Andrew Morrow <acm@mongodb.com> | 2015-07-21 11:25:20 -0400 |
commit | c7e67d723514aa9b78b9af4fd3996d58704c8f99 (patch) | |
tree | f97ca13c3f1e201fa47be80068ada6b6c8f95939 /src/mongo/unittest | |
parent | bb2f68f8c42c7649b33b4b3855386fc954bc8fd4 (diff) | |
download | mongo-c7e67d723514aa9b78b9af4fd3996d58704c8f99.tar.gz |
SERVER-9666 Remove test watchdog and support code
Diffstat (limited to 'src/mongo/unittest')
-rw-r--r-- | src/mongo/unittest/unittest.cpp | 4 | ||||
-rw-r--r-- | src/mongo/unittest/unittest.h | 6 | ||||
-rw-r--r-- | src/mongo/unittest/unittest_main.cpp | 2 |
3 files changed, 0 insertions, 12 deletions
diff --git a/src/mongo/unittest/unittest.cpp b/src/mongo/unittest/unittest.cpp index 3e81b89b65e..b4e380abc26 100644 --- a/src/mongo/unittest/unittest.cpp +++ b/src/mongo/unittest/unittest.cpp @@ -241,8 +241,6 @@ Result* Suite::run(const std::string& filter, int runsPerTest) { bool passes = false; - onCurrentTestNameChange(tc->getName()); - log() << "\t going to run test: " << tc->getName() << std::endl; std::stringstream err; @@ -273,8 +271,6 @@ Result* Suite::run(const std::string& filter, int runsPerTest) { r->_millis = timer.millis(); - onCurrentTestNameChange(""); - log() << "\t DONE running tests" << std::endl; return r; diff --git a/src/mongo/unittest/unittest.h b/src/mongo/unittest/unittest.h index d613822441e..aea8faa8f8b 100644 --- a/src/mongo/unittest/unittest.h +++ b/src/mongo/unittest/unittest.h @@ -536,12 +536,6 @@ T assertGet(StatusWith<T>&& swt) { } /** - * Hack to support the runaway test observer in dbtests. This is a hook that - * unit test running harnesses (unittest_main and dbtests) must implement. - */ -void onCurrentTestNameChange(const std::string& testName); - -/** * Return a list of suite names. */ std::vector<std::string> getAllSuiteNames(); diff --git a/src/mongo/unittest/unittest_main.cpp b/src/mongo/unittest/unittest_main.cpp index 56b371d3289..400135aaa09 100644 --- a/src/mongo/unittest/unittest_main.cpp +++ b/src/mongo/unittest/unittest_main.cpp @@ -39,5 +39,3 @@ int main(int argc, char** argv, char** envp) { ::mongo::runGlobalInitializersOrDie(argc, argv, envp); return ::mongo::unittest::Suite::run(std::vector<std::string>(), "", 1); } - -void mongo::unittest::onCurrentTestNameChange(const std::string& testName) {} |