[Lemon-commits] Alpar Juttner: Add build id field to running tim...

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon-benchmark/rev/0ab493e5250e
changeset: 13:0ab493e5250e
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Sun Dec 11 18:43:33 2011 +0100
description:
	Add build id field to running time logs

	Configurable by BENCHMARK_BUILD_ID cmake variable, which defaults to
	the last component of the build directory.

diffstat:

 CMakeLists.txt          |  4 ++++
 tests/benchmark_tools.h |  5 +++--
 tests/paths.cc.cmake    |  1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diffs (42 lines):

diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,10 @@
 SET(PROJECT_VERSION "hg-tip"
     CACHE STRING "${PROJECT_NAME} version string")
 
+GET_FILENAME_COMPONENT(BUILD_DIR_NAME ${CMAKE_BINARY_DIR} NAME)
+
+SET(BENCHMARK_BUILD_ID ${BUILD_DIR_NAME} CACHE STRING "Benchmark build id")
+
 ## Do not edit this.
 PROJECT(${PROJECT_NAME})
 
diff --git a/tests/benchmark_tools.h b/tests/benchmark_tools.h
--- a/tests/benchmark_tools.h
+++ b/tests/benchmark_tools.h
@@ -28,13 +28,14 @@
 extern std::string instance_name;
 
 extern const std::string DATADIR_PATH;
-
+extern const std::string BENCHMARK_BUILD_ID;
 
 inline void logTime(const std::string &_instance_name,
 		    const std::string &subtest_name,
 		    const lemon::TimeStamp &time)
 {
-  std::cout << "*** " << test_name
+  std::cout << "*** " << BENCHMARK_BUILD_ID 
+	    << ' ' << test_name
 	    << ' ' << _instance_name
 	    << ' ' << subtest_name
 	    << ' ' << std::setiosflags(std::ios::fixed) << std::setprecision(4)
diff --git a/tests/paths.cc.cmake b/tests/paths.cc.cmake
--- a/tests/paths.cc.cmake
+++ b/tests/paths.cc.cmake
@@ -2,3 +2,4 @@
 #include <string>
 
 const std::string DATADIR_PATH = "@DATADIR_PATH@";
+const std::string BENCHMARK_BUILD_ID = "@BENCHMARK_BUILD_ID@";