From: Roald J. van Loon <roaldvanloon@gmail.com>
Date: Sat, 7 Sep 2013 14:37:10 +0000 (+0200)
Subject: automake cleanup: renaming buildtest
X-Git-Tag: v0.71~163^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=99c6be2fcf15cc3f13eb735fdd55d6e9f2107104;p=ceph.git

automake cleanup: renaming buildtest

The previous name could cause confusion (it's not only used to test
build libcommon anymore).

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 7ed2d8828bd3..4a67214a1e19 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -298,22 +298,22 @@ ceph_multi_stress_watch_LDADD = librados.la $(LIBGLOBAL_LDA)
 bin_DEBUGPROGRAMS += ceph_multi_stress_watch 
 
 if WITH_BUILD_TESTS
-ceph_test_libcommon_build_SOURCES = test/test_libcommon_build.cc $(libcommon_files)
+ceph_test_libcommon_build_SOURCES = test/buildtest_skeleton.cc $(libcommon_files)
 ceph_test_libcommon_build_LDADD = libcrc.la $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 bin_DEBUGPROGRAMS += ceph_test_libcommon_build
 
-ceph_test_librados_build_SOURCES = test/test_libcommon_build.cc $(libcommon_files) $(librados_SOURCES)
+ceph_test_librados_build_SOURCES = test/buildtest_skeleton.cc $(libcommon_files) $(librados_SOURCES)
 ceph_test_librados_build_LDADD = libcrc.la $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 ceph_test_librados_build_CXXFLAGS = $(AM_CXXFLAGS)
 bin_DEBUGPROGRAMS += ceph_test_librados_build
 
-ceph_test_librgw_build_SOURCES = test/test_libcommon_build.cc $(libcommon_files) \
+ceph_test_librgw_build_SOURCES = test/buildtest_skeleton.cc $(libcommon_files) \
 			    $(librados_SOURCES) $(librgw_la_SOURCES)
 ceph_test_librgw_build_LDADD = libcrc.la -lexpat $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 ceph_test_librgw_build_CXXFLAGS = $(AM_CXXFLAGS)
 bin_DEBUGPROGRAMS += ceph_test_librgw_build
 
-ceph_test_libcephfs_build_SOURCES = test/test_libcommon_build.cc $(libcommon_files) \
+ceph_test_libcephfs_build_SOURCES = test/buildtest_skeleton.cc $(libcommon_files) \
 			    $(libosdc_la_SOURCES)
 ceph_test_libcephfs_build_LDADD = libcrc.la libcephfs.la -lexpat $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 ceph_test_libcephfs_build_CXXFLAGS = $(AM_CXXFLAGS)
@@ -321,7 +321,7 @@ bin_DEBUGPROGRAMS += ceph_test_libcephfs_build
 endif
 
 if WITH_HADOOPCLIENT
-ceph_test_libhadoopcephfs_build_SOURCES = test/test_libcommon_build.cc \
+ceph_test_libhadoopcephfs_build_SOURCES = test/buildtest_skeleton.cc \
          $(libhadoopcephfs_la_SOURCES) \
 	 $(libosdc_la_SOURCES) $(libcommon_files)
 ceph_test_libhadoopcephfs_build_LDADD = libcrc.la libcephfs.la -lexpat $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS)
diff --git a/src/test/buildtest_skeleton.cc b/src/test/buildtest_skeleton.cc
new file mode 100644
index 000000000000..8215a05dbdae
--- /dev/null
+++ b/src/test/buildtest_skeleton.cc
@@ -0,0 +1,13 @@
+#include "common/common_init.h"
+
+/* This program exists to test that we can build libcommon without
+ * referencing g_ceph_context
+ *
+ * This program will go away as soon as we actually don't use g_ceph_context in
+ * more programs. Obviously, at that point, those programs will provide an
+ * equivalent test.
+ */
+int main(int argc, char **argv)
+{
+  return 0;
+}
diff --git a/src/test/test_libcommon_build.cc b/src/test/test_libcommon_build.cc
deleted file mode 100644
index 8215a05dbdae..000000000000
--- a/src/test/test_libcommon_build.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "common/common_init.h"
-
-/* This program exists to test that we can build libcommon without
- * referencing g_ceph_context
- *
- * This program will go away as soon as we actually don't use g_ceph_context in
- * more programs. Obviously, at that point, those programs will provide an
- * equivalent test.
- */
-int main(int argc, char **argv)
-{
-  return 0;
-}