From bec12096e717c59972e6db01c53f8d62220f2695 Mon Sep 17 00:00:00 2001
From: Loic Dachary <loic@dachary.org>
Date: Mon, 3 Feb 2014 12:50:20 +0100
Subject: [PATCH] erasure-code: benchmark moves to a dedicated directory

Signed-off-by: Loic Dachary <loic@dachary.org>
---
 src/test/Makefile.am                                 | 12 ++----------
 src/test/erasure-code/Makefile.am                    | 10 ++++++++++
 .../ceph_erasure_code_benchmark.cc                   |  4 ++--
 .../ceph_erasure_code_benchmark.h                    |  2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 src/test/erasure-code/Makefile.am
 rename src/test/{osd => erasure-code}/ceph_erasure_code_benchmark.cc (98%)
 rename src/test/{osd => erasure-code}/ceph_erasure_code_benchmark.h (92%)

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 84c9ef93874c7..91af9bc6fca0a 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -1,3 +1,5 @@
+include test/erasure-code/Makefile.am
+
 ## Unknown/other tests
 
 ceph_test_timers_SOURCES = test/TestTimers.cc
@@ -181,15 +183,6 @@ ceph_multi_stress_watch_SOURCES = \
 ceph_multi_stress_watch_LDADD = $(LIBRADOS) $(CEPH_GLOBAL)
 bin_DEBUGPROGRAMS += ceph_multi_stress_watch 
 
-ceph_erasure_code_benchmark_SOURCES = \
-	test/osd/ceph_erasure_code_benchmark.cc
-ceph_erasure_code_benchmark_LDADD = $(LIBOSD) $(LIBCOMMON) $(BOOST_PROGRAM_OPTIONS_LIBS) $(CEPH_GLOBAL)
-if LINUX
-ceph_erasure_code_benchmark_LDADD += -ldl
-endif
-bin_DEBUGPROGRAMS += ceph_erasure_code_benchmark
-
-
 ## System tests
 
 if LINUX
@@ -959,7 +952,6 @@ noinst_HEADERS += \
 	test/librados/test.h \
 	test/ObjectMap/KeyValueDBMemory.h \
 	test/omap_bench.h \
-	test/osd/ceph_erasure_code_benchmark.h \
 	test/osdc/FakeWriteback.h \
 	test/osd/Object.h \
 	test/osd/RadosModel.h \
diff --git a/src/test/erasure-code/Makefile.am b/src/test/erasure-code/Makefile.am
new file mode 100644
index 0000000000000..d5e9eac1443d5
--- /dev/null
+++ b/src/test/erasure-code/Makefile.am
@@ -0,0 +1,10 @@
+ceph_erasure_code_benchmark_SOURCES = \
+	test/erasure-code/ceph_erasure_code_benchmark.cc
+ceph_erasure_code_benchmark_LDADD = $(LIBOSD) $(LIBCOMMON) $(BOOST_PROGRAM_OPTIONS_LIBS) $(CEPH_GLOBAL)
+if LINUX
+ceph_erasure_code_benchmark_LDADD += -ldl
+endif
+bin_DEBUGPROGRAMS += ceph_erasure_code_benchmark
+
+noinst_HEADERS += \
+	test/erasure-code/ceph_erasure_code_benchmark.h
diff --git a/src/test/osd/ceph_erasure_code_benchmark.cc b/src/test/erasure-code/ceph_erasure_code_benchmark.cc
similarity index 98%
rename from src/test/osd/ceph_erasure_code_benchmark.cc
rename to src/test/erasure-code/ceph_erasure_code_benchmark.cc
index f4fdaf3e566f1..b4e02e4403459 100644
--- a/src/test/osd/ceph_erasure_code_benchmark.cc
+++ b/src/test/erasure-code/ceph_erasure_code_benchmark.cc
@@ -3,7 +3,7 @@
 /*
  * Ceph - scalable distributed file system
  *
- * Copyright (C) 2013 Cloudwatt <libre.licensing@cloudwatt.com>
+ * Copyright (C) 2013,2014 Cloudwatt <libre.licensing@cloudwatt.com>
  *
  * Author: Loic Dachary <loic@dachary.org>
  *
@@ -23,7 +23,7 @@
 #include <boost/program_options/parsers.hpp>
 #include <boost/algorithm/string.hpp>
 
-#include "test/osd/ceph_erasure_code_benchmark.h"
+#include "ceph_erasure_code_benchmark.h"
 #include "global/global_context.h"
 #include "global/global_init.h"
 #include "common/ceph_argparse.h"
diff --git a/src/test/osd/ceph_erasure_code_benchmark.h b/src/test/erasure-code/ceph_erasure_code_benchmark.h
similarity index 92%
rename from src/test/osd/ceph_erasure_code_benchmark.h
rename to src/test/erasure-code/ceph_erasure_code_benchmark.h
index 8ea60f94f4c91..df73aa75eb49f 100644
--- a/src/test/osd/ceph_erasure_code_benchmark.h
+++ b/src/test/erasure-code/ceph_erasure_code_benchmark.h
@@ -3,7 +3,7 @@
 /*
  * Ceph - scalable distributed file system
  *
- * Copyright (C) 2013 Cloudwatt <libre.licensing@cloudwatt.com>
+ * Copyright (C) 2013,2014 Cloudwatt <libre.licensing@cloudwatt.com>
  *
  * Author: Loic Dachary <loic@dachary.org>
  *
-- 
2.39.5