Moved benchmarks to the tests/ directory

2010-12-28 13:17:27 +01:00 · 2010-12-28 13:17:27 +01:00 · 4fe1656cf8
commit 4fe1656cf8
parent a883330101
10 changed files with 8 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -97,9 +97,6 @@ if (WITH_TESTING)
  add_subdirectory(tests)
 endif (WITH_TESTING)

-if (WITH_BENCHMARKS)
-    add_subdirectory(benchmarks)
-endif (WITH_BENCHMARKS)	

 message(STATUS "********************************************")
 message(STATUS "********** ${PROJECT_NAME} build options : **********")
--- a/DefineOptions.cmake
+++ b/DefineOptions.cmake
@ -14,3 +14,6 @@ option(WITH_BENCHMARKS "Build benchmarks tools" OFF)
 if (WITH_TESTING)
  set(WITH_STATIC_LIB ON)
 endif (WITH_TESTING)
+if(WITH_BENCHMARKS)
+  set(WITH_TESTING ON)
+endif(WITH_BENCHMARKS)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -32,3 +32,8 @@ add_subdirectory(unittests)
 if (WITH_CLIENT_TESTING)
    add_subdirectory(client)
 endif (WITH_CLIENT_TESTING)
+
+if (WITH_BENCHMARKS)
+    add_subdirectory(benchmarks)
+endif (WITH_BENCHMARKS)	
+
--- a/tests/benchmarks/CMakeLists.txt
+++ b/tests/benchmarks/CMakeLists.txt
--- a/tests/benchmarks/bench1.sh
+++ b/tests/benchmarks/bench1.sh
--- a/tests/benchmarks/bench2.sh
+++ b/tests/benchmarks/bench2.sh
--- a/tests/benchmarks/bench_scp.c
+++ b/tests/benchmarks/bench_scp.c
--- a/tests/benchmarks/benchmarks.c
+++ b/tests/benchmarks/benchmarks.c
--- a/tests/benchmarks/benchmarks.h
+++ b/tests/benchmarks/benchmarks.h
--- a/tests/benchmarks/latency.c
+++ b/tests/benchmarks/latency.c