From fc963acfb6ee005b94be169c36c71763feff6f87 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Thu, 6 Feb 2014 11:28:21 +0100 Subject: [PATCH] erasure-code: move test files to a dedicated directory Signed-off-by: Loic Dachary --- src/test/Makefile.am | 68 ------------------- .../ErasureCodeExample.h | 0 .../ErasureCodePluginExample.cc | 0 .../ErasureCodePluginFailToInitialize.cc | 0 .../ErasureCodePluginFailToRegister.cc | 0 .../ErasureCodePluginHangs.cc | 0 .../ErasureCodePluginMissingEntryPoint.cc | 0 src/test/erasure-code/Makefile.am | 68 +++++++++++++++++++ .../TestErasureCodeExample.cc | 0 .../TestErasureCodeJerasure.cc | 0 .../TestErasureCodePlugin.cc | 0 .../TestErasureCodePluginJerasure.cc | 0 12 files changed, 68 insertions(+), 68 deletions(-) rename src/test/{osd => erasure-code}/ErasureCodeExample.h (100%) rename src/test/{osd => erasure-code}/ErasureCodePluginExample.cc (100%) rename src/test/{osd => erasure-code}/ErasureCodePluginFailToInitialize.cc (100%) rename src/test/{osd => erasure-code}/ErasureCodePluginFailToRegister.cc (100%) rename src/test/{osd => erasure-code}/ErasureCodePluginHangs.cc (100%) rename src/test/{osd => erasure-code}/ErasureCodePluginMissingEntryPoint.cc (100%) rename src/test/{osd => erasure-code}/TestErasureCodeExample.cc (100%) rename src/test/{osd => erasure-code}/TestErasureCodeJerasure.cc (100%) rename src/test/{osd => erasure-code}/TestErasureCodePlugin.cc (100%) rename src/test/{osd => erasure-code}/TestErasureCodePluginJerasure.cc (100%) diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 91af9bc6fca0..bc6767ff626a 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -354,74 +354,6 @@ unittest_ceph_compatset_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) unittest_ceph_compatset_CXXFLAGS = $(UNITTEST_CXXFLAGS) check_PROGRAMS += unittest_ceph_compatset -libec_example_la_SOURCES = test/osd/ErasureCodePluginExample.cc -libec_example_la_CFLAGS = ${AM_CFLAGS} -libec_example_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_example_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libec_example_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*' -erasure_codelib_LTLIBRARIES += libec_example.la - -libec_missing_entry_point_la_SOURCES = test/osd/ErasureCodePluginMissingEntryPoint.cc -libec_missing_entry_point_la_CFLAGS = ${AM_CFLAGS} -libec_missing_entry_point_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_missing_entry_point_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libec_missing_entry_point_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*' -erasure_codelib_LTLIBRARIES += libec_missing_entry_point.la - -libec_hangs_la_SOURCES = test/osd/ErasureCodePluginHangs.cc -libec_hangs_la_CFLAGS = ${AM_CFLAGS} -libec_hangs_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_hangs_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libec_hangs_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*' -erasure_codelib_LTLIBRARIES += libec_hangs.la - -libec_fail_to_initialize_la_SOURCES = test/osd/ErasureCodePluginFailToInitialize.cc -libec_fail_to_initialize_la_CFLAGS = ${AM_CFLAGS} -libec_fail_to_initialize_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_fail_to_initialize_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libec_fail_to_initialize_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*' -erasure_codelib_LTLIBRARIES += libec_fail_to_initialize.la - -libec_fail_to_register_la_SOURCES = test/osd/ErasureCodePluginFailToRegister.cc -libec_fail_to_register_la_CFLAGS = ${AM_CFLAGS} -libec_fail_to_register_la_CXXFLAGS= ${AM_CXXFLAGS} -libec_fail_to_register_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libec_fail_to_register_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*' -erasure_codelib_LTLIBRARIES += libec_fail_to_register.la - -unittest_erasure_code_plugin_SOURCES = test/osd/TestErasureCodePlugin.cc -unittest_erasure_code_plugin_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_erasure_code_plugin_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -if LINUX -unittest_erasure_code_plugin_LDADD += -ldl -endif -check_PROGRAMS += unittest_erasure_code_plugin - -unittest_erasure_code_jerasure_SOURCES = \ - test/osd/TestErasureCodeJerasure.cc \ - $(libec_jerasure_la_SOURCES) -unittest_erasure_code_jerasure_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_erasure_code_jerasure_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -if LINUX -unittest_erasure_code_jerasure_LDADD += -ldl -endif -check_PROGRAMS += unittest_erasure_code_jerasure - -unittest_erasure_code_plugin_jerasure_SOURCES = \ - test/osd/TestErasureCodePluginJerasure.cc -unittest_erasure_code_plugin_jerasure_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} -unittest_erasure_code_plugin_jerasure_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -if LINUX -unittest_erasure_code_plugin_jerasure_LDADD += -ldl -endif -check_PROGRAMS += unittest_erasure_code_plugin_jerasure - -unittest_erasure_code_example_SOURCES = test/osd/TestErasureCodeExample.cc -noinst_HEADERS += test/osd/ErasureCodeExample.h -unittest_erasure_code_example_CXXFLAGS = $(UNITTEST_CXXFLAGS) -unittest_erasure_code_example_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -check_PROGRAMS += unittest_erasure_code_example - unittest_osd_types_SOURCES = test/test_osd_types.cc unittest_osd_types_CXXFLAGS = $(UNITTEST_CXXFLAGS) unittest_osd_types_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) diff --git a/src/test/osd/ErasureCodeExample.h b/src/test/erasure-code/ErasureCodeExample.h similarity index 100% rename from src/test/osd/ErasureCodeExample.h rename to src/test/erasure-code/ErasureCodeExample.h diff --git a/src/test/osd/ErasureCodePluginExample.cc b/src/test/erasure-code/ErasureCodePluginExample.cc similarity index 100% rename from src/test/osd/ErasureCodePluginExample.cc rename to src/test/erasure-code/ErasureCodePluginExample.cc diff --git a/src/test/osd/ErasureCodePluginFailToInitialize.cc b/src/test/erasure-code/ErasureCodePluginFailToInitialize.cc similarity index 100% rename from src/test/osd/ErasureCodePluginFailToInitialize.cc rename to src/test/erasure-code/ErasureCodePluginFailToInitialize.cc diff --git a/src/test/osd/ErasureCodePluginFailToRegister.cc b/src/test/erasure-code/ErasureCodePluginFailToRegister.cc similarity index 100% rename from src/test/osd/ErasureCodePluginFailToRegister.cc rename to src/test/erasure-code/ErasureCodePluginFailToRegister.cc diff --git a/src/test/osd/ErasureCodePluginHangs.cc b/src/test/erasure-code/ErasureCodePluginHangs.cc similarity index 100% rename from src/test/osd/ErasureCodePluginHangs.cc rename to src/test/erasure-code/ErasureCodePluginHangs.cc diff --git a/src/test/osd/ErasureCodePluginMissingEntryPoint.cc b/src/test/erasure-code/ErasureCodePluginMissingEntryPoint.cc similarity index 100% rename from src/test/osd/ErasureCodePluginMissingEntryPoint.cc rename to src/test/erasure-code/ErasureCodePluginMissingEntryPoint.cc diff --git a/src/test/erasure-code/Makefile.am b/src/test/erasure-code/Makefile.am index b467eea5a2fd..dc94168262b6 100644 --- a/src/test/erasure-code/Makefile.am +++ b/src/test/erasure-code/Makefile.am @@ -14,5 +14,73 @@ ceph_erasure_code_LDADD += -ldl endif bin_DEBUGPROGRAMS += ceph_erasure_code +libec_example_la_SOURCES = test/erasure-code/ErasureCodePluginExample.cc +libec_example_la_CFLAGS = ${AM_CFLAGS} +libec_example_la_CXXFLAGS= ${AM_CXXFLAGS} +libec_example_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) +libec_example_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*' +erasure_codelib_LTLIBRARIES += libec_example.la + +libec_missing_entry_point_la_SOURCES = test/erasure-code/ErasureCodePluginMissingEntryPoint.cc +libec_missing_entry_point_la_CFLAGS = ${AM_CFLAGS} +libec_missing_entry_point_la_CXXFLAGS= ${AM_CXXFLAGS} +libec_missing_entry_point_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) +libec_missing_entry_point_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*' +erasure_codelib_LTLIBRARIES += libec_missing_entry_point.la + +libec_hangs_la_SOURCES = test/erasure-code/ErasureCodePluginHangs.cc +libec_hangs_la_CFLAGS = ${AM_CFLAGS} +libec_hangs_la_CXXFLAGS= ${AM_CXXFLAGS} +libec_hangs_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) +libec_hangs_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*' +erasure_codelib_LTLIBRARIES += libec_hangs.la + +libec_fail_to_initialize_la_SOURCES = test/erasure-code/ErasureCodePluginFailToInitialize.cc +libec_fail_to_initialize_la_CFLAGS = ${AM_CFLAGS} +libec_fail_to_initialize_la_CXXFLAGS= ${AM_CXXFLAGS} +libec_fail_to_initialize_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) +libec_fail_to_initialize_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*' +erasure_codelib_LTLIBRARIES += libec_fail_to_initialize.la + +libec_fail_to_register_la_SOURCES = test/erasure-code/ErasureCodePluginFailToRegister.cc +libec_fail_to_register_la_CFLAGS = ${AM_CFLAGS} +libec_fail_to_register_la_CXXFLAGS= ${AM_CXXFLAGS} +libec_fail_to_register_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) +libec_fail_to_register_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*' +erasure_codelib_LTLIBRARIES += libec_fail_to_register.la + +unittest_erasure_code_plugin_SOURCES = test/erasure-code/TestErasureCodePlugin.cc +unittest_erasure_code_plugin_CXXFLAGS = $(UNITTEST_CXXFLAGS) +unittest_erasure_code_plugin_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) +if LINUX +unittest_erasure_code_plugin_LDADD += -ldl +endif +check_PROGRAMS += unittest_erasure_code_plugin + +unittest_erasure_code_jerasure_SOURCES = \ + test/erasure-code/TestErasureCodeJerasure.cc \ + $(libec_jerasure_la_SOURCES) +unittest_erasure_code_jerasure_CXXFLAGS = $(UNITTEST_CXXFLAGS) +unittest_erasure_code_jerasure_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) +if LINUX +unittest_erasure_code_jerasure_LDADD += -ldl +endif +check_PROGRAMS += unittest_erasure_code_jerasure + +unittest_erasure_code_plugin_jerasure_SOURCES = \ + test/erasure-code/TestErasureCodePluginJerasure.cc +unittest_erasure_code_plugin_jerasure_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} +unittest_erasure_code_plugin_jerasure_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) +if LINUX +unittest_erasure_code_plugin_jerasure_LDADD += -ldl +endif +check_PROGRAMS += unittest_erasure_code_plugin_jerasure + +unittest_erasure_code_example_SOURCES = test/erasure-code/TestErasureCodeExample.cc +noinst_HEADERS += test/erasure-code/ErasureCodeExample.h +unittest_erasure_code_example_CXXFLAGS = $(UNITTEST_CXXFLAGS) +unittest_erasure_code_example_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) +check_PROGRAMS += unittest_erasure_code_example + noinst_HEADERS += \ test/erasure-code/ceph_erasure_code_benchmark.h diff --git a/src/test/osd/TestErasureCodeExample.cc b/src/test/erasure-code/TestErasureCodeExample.cc similarity index 100% rename from src/test/osd/TestErasureCodeExample.cc rename to src/test/erasure-code/TestErasureCodeExample.cc diff --git a/src/test/osd/TestErasureCodeJerasure.cc b/src/test/erasure-code/TestErasureCodeJerasure.cc similarity index 100% rename from src/test/osd/TestErasureCodeJerasure.cc rename to src/test/erasure-code/TestErasureCodeJerasure.cc diff --git a/src/test/osd/TestErasureCodePlugin.cc b/src/test/erasure-code/TestErasureCodePlugin.cc similarity index 100% rename from src/test/osd/TestErasureCodePlugin.cc rename to src/test/erasure-code/TestErasureCodePlugin.cc diff --git a/src/test/osd/TestErasureCodePluginJerasure.cc b/src/test/erasure-code/TestErasureCodePluginJerasure.cc similarity index 100% rename from src/test/osd/TestErasureCodePluginJerasure.cc rename to src/test/erasure-code/TestErasureCodePluginJerasure.cc -- 2.47.3