diff -r d7ce0311ece2 -r cf6519daa7fa tests/benchmark_tools.h --- a/tests/benchmark_tools.h Sun Dec 11 07:33:29 2011 +0100 +++ b/tests/benchmark_tools.h Sun Dec 11 11:19:39 2011 +0100 @@ -6,16 +6,29 @@ #include #include -extern const char test_name[]; +extern std::string test_name; +extern std::string instance_name; -inline void logTime(const std::string &subtest_name, const - lemon::TimeStamp &time) +extern const std::string DATADIR_PATH; + + +inline void logTime(const std::string &_instance_name, + const std::string &subtest_name, + const lemon::TimeStamp &time) { - std::cout << "*** " << test_name << ' ' << subtest_name << ' ' - << std::setiosflags(std::ios::fixed) << std::setprecision(4) + std::cout << "*** " << test_name + << ' ' << _instance_name + << ' ' << subtest_name + << ' ' << std::setiosflags(std::ios::fixed) << std::setprecision(4) << time.realTime() << ' ' << time.realTime()/(time.userTime()+time.systemTime()) - 1.0 << std::endl; } +inline void logTime(const std::string &subtest_name, + const lemon::TimeStamp &time) +{ + logTime(instance_name,subtest_name,time); +} + #endif