librados: move misc tests into test/librados/ dir

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 1ddc73689248474944747a3abc2628f84526ca76..926a5321f15e426b8ec6164972db167db8848cd5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -681,7 +681,7 @@ unittest_simple_spin_LDADD = libcephfs.la ${UNITTEST_LDADD}
 unittest_simple_spin_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 check_PROGRAMS += unittest_simple_spin
 
-unittest_librados_SOURCES = test/librados.cc
+unittest_librados_SOURCES = test/librados/librados.cc
 unittest_librados_LDFLAGS = $(PTHREAD_CFLAGS) ${AM_LDFLAGS}
 unittest_librados_LDADD = librados.la ${UNITTEST_LDADD}
 unittest_librados_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
@@ -764,7 +764,7 @@ unittest_libcephfs_config_LDADD =  libcephfs.la ${UNITTEST_LDADD}
 unittest_libcephfs_config_CXXFLAGS = ${CRYPTO_CFLAGS} ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 check_PROGRAMS += unittest_libcephfs_config
 
-unittest_librados_config_SOURCES = test/librados_config.cc
+unittest_librados_config_SOURCES = test/librados/librados_config.cc
 unittest_librados_config_LDFLAGS = $(PTHREAD_CFLAGS) ${AM_LDFLAGS}
 unittest_librados_config_LDADD =  librados.la ${UNITTEST_LDADD}
 unittest_librados_config_CXXFLAGS = ${CRYPTO_CFLAGS} ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}

diff --git a/src/test/librados.cc b/src/test/librados.cc
deleted file mode 100644 (file)
index c688724..0000000
--- a/src/test/librados.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-//#include "common/config.h"
-#include "include/rados/librados.h"
-
-#include "gtest/gtest.h"
-
-TEST(Librados, CreateShutdown) {
-  rados_t cluster;
-  int err;
-  err = rados_create(&cluster, "someid");
-  EXPECT_EQ(err, 0);
-
-  rados_shutdown(cluster);
-}

diff --git a/src/test/librados/librados.cc b/src/test/librados/librados.cc
new file mode 100644 (file)
index 0000000..c688724
--- /dev/null
+++ b/src/test/librados/librados.cc
@@ -0,0 +1,13 @@
+//#include "common/config.h"
+#include "include/rados/librados.h"
+
+#include "gtest/gtest.h"
+
+TEST(Librados, CreateShutdown) {
+  rados_t cluster;
+  int err;
+  err = rados_create(&cluster, "someid");
+  EXPECT_EQ(err, 0);
+
+  rados_shutdown(cluster);
+}

diff --git a/src/test/librados/librados_config.cc b/src/test/librados/librados_config.cc
new file mode 100644 (file)
index 0000000..81c0465
--- /dev/null
+++ b/src/test/librados/librados_config.cc
@@ -0,0 +1,98 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2011 New Dream Network
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation.  See file COPYING.
+ *
+ */
+
+#include "gtest/gtest.h"
+#include "include/rados/librados.h"
+
+#include <sstream>
+#include <string>
+#include <string.h>
+#include <errno.h>
+
+using std::string;
+
+TEST(LibRadosConfig, SimpleSet) {
+  rados_t cl;
+  int ret = rados_create(&cl, NULL);
+  ASSERT_EQ(ret, 0);
+
+  ret = rados_conf_set(cl, "max_open_files", "21");
+  ASSERT_EQ(ret, 0);
+
+  char buf[128];
+  memset(buf, 0, sizeof(buf));
+  ret = rados_conf_get(cl, "max_open_files", buf, sizeof(buf));
+  ASSERT_EQ(ret, 0);
+  ASSERT_EQ(string("21"), string(buf));
+
+  rados_shutdown(cl);
+}
+
+TEST(LibRadosConfig, ArgV) {
+  rados_t cl;
+  int ret = rados_create(&cl, NULL);
+  ASSERT_EQ(ret, 0);
+
+  const char *argv[] = { "foo", "--max-open-files", "2",
+                        "--keyfile", "/tmp/my-keyfile", NULL };
+  size_t argc = (sizeof(argv) / sizeof(argv[0])) - 1;
+  rados_conf_parse_argv(cl, argc, argv);
+
+  char buf[128];
+  memset(buf, 0, sizeof(buf));
+  ret = rados_conf_get(cl, "keyfile", buf, sizeof(buf));
+  ASSERT_EQ(ret, 0);
+  ASSERT_EQ(string("/tmp/my-keyfile"), string(buf));
+
+  memset(buf, 0, sizeof(buf));
+  ret = rados_conf_get(cl, "max_open_files", buf, sizeof(buf));
+  ASSERT_EQ(ret, 0);
+  ASSERT_EQ(string("2"), string(buf));
+
+  rados_shutdown(cl);
+}
+
+TEST(LibRadosConfig, DebugLevels) {
+  rados_t cl;
+  int ret = rados_create(&cl, NULL);
+  ASSERT_EQ(ret, 0);
+
+  ret = rados_conf_set(cl, "debug_rados", "3");
+  ASSERT_EQ(ret, 0);
+
+  char buf[128];
+  memset(buf, 0, sizeof(buf));
+  ret = rados_conf_get(cl, "debug_rados", buf, sizeof(buf));
+  ASSERT_EQ(ret, 0);
+  ASSERT_EQ(0, strncmp("3/", buf, 2));
+
+  ret = rados_conf_set(cl, "debug_rados", "7/8");
+  ASSERT_EQ(ret, 0);
+
+  memset(buf, 0, sizeof(buf));
+  ret = rados_conf_get(cl, "debug_rados", buf, sizeof(buf));
+  ASSERT_EQ(ret, 0);
+  ASSERT_EQ(0, strcmp("7/8", buf));
+
+  ret = rados_conf_set(cl, "debug_rados", "foo");
+  ASSERT_EQ(ret, -EINVAL);
+
+  ret = rados_conf_set(cl, "debug_asdkfasdjfajksdf", "foo");
+  ASSERT_EQ(ret, -ENOENT);
+
+  ret = rados_conf_get(cl, "debug_radfjadfsdados", buf, sizeof(buf));
+  ASSERT_EQ(ret, -ENOENT);
+
+  rados_shutdown(cl);
+}

diff --git a/src/test/librados_config.cc b/src/test/librados_config.cc
deleted file mode 100644 (file)
index 81c0465..0000000
--- a/src/test/librados_config.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-/*
- * Ceph - scalable distributed file system
- *
- * Copyright (C) 2011 New Dream Network
- *
- * This is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software
- * Foundation.  See file COPYING.
- *
- */
-
-#include "gtest/gtest.h"
-#include "include/rados/librados.h"
-
-#include <sstream>
-#include <string>
-#include <string.h>
-#include <errno.h>
-
-using std::string;
-
-TEST(LibRadosConfig, SimpleSet) {
-  rados_t cl;
-  int ret = rados_create(&cl, NULL);
-  ASSERT_EQ(ret, 0);
-
-  ret = rados_conf_set(cl, "max_open_files", "21");
-  ASSERT_EQ(ret, 0);
-
-  char buf[128];
-  memset(buf, 0, sizeof(buf));
-  ret = rados_conf_get(cl, "max_open_files", buf, sizeof(buf));
-  ASSERT_EQ(ret, 0);
-  ASSERT_EQ(string("21"), string(buf));
-
-  rados_shutdown(cl);
-}
-
-TEST(LibRadosConfig, ArgV) {
-  rados_t cl;
-  int ret = rados_create(&cl, NULL);
-  ASSERT_EQ(ret, 0);
-
-  const char *argv[] = { "foo", "--max-open-files", "2",
-                        "--keyfile", "/tmp/my-keyfile", NULL };
-  size_t argc = (sizeof(argv) / sizeof(argv[0])) - 1;
-  rados_conf_parse_argv(cl, argc, argv);
-
-  char buf[128];
-  memset(buf, 0, sizeof(buf));
-  ret = rados_conf_get(cl, "keyfile", buf, sizeof(buf));
-  ASSERT_EQ(ret, 0);
-  ASSERT_EQ(string("/tmp/my-keyfile"), string(buf));
-
-  memset(buf, 0, sizeof(buf));
-  ret = rados_conf_get(cl, "max_open_files", buf, sizeof(buf));
-  ASSERT_EQ(ret, 0);
-  ASSERT_EQ(string("2"), string(buf));
-
-  rados_shutdown(cl);
-}
-
-TEST(LibRadosConfig, DebugLevels) {
-  rados_t cl;
-  int ret = rados_create(&cl, NULL);
-  ASSERT_EQ(ret, 0);
-
-  ret = rados_conf_set(cl, "debug_rados", "3");
-  ASSERT_EQ(ret, 0);
-
-  char buf[128];
-  memset(buf, 0, sizeof(buf));
-  ret = rados_conf_get(cl, "debug_rados", buf, sizeof(buf));
-  ASSERT_EQ(ret, 0);
-  ASSERT_EQ(0, strncmp("3/", buf, 2));
-
-  ret = rados_conf_set(cl, "debug_rados", "7/8");
-  ASSERT_EQ(ret, 0);
-
-  memset(buf, 0, sizeof(buf));
-  ret = rados_conf_get(cl, "debug_rados", buf, sizeof(buf));
-  ASSERT_EQ(ret, 0);
-  ASSERT_EQ(0, strcmp("7/8", buf));
-
-  ret = rados_conf_set(cl, "debug_rados", "foo");
-  ASSERT_EQ(ret, -EINVAL);
-
-  ret = rados_conf_set(cl, "debug_asdkfasdjfajksdf", "foo");
-  ASSERT_EQ(ret, -ENOENT);
-
-  ret = rados_conf_get(cl, "debug_radfjadfsdados", buf, sizeof(buf));
-  ASSERT_EQ(ret, -ENOENT);
-
-  rados_shutdown(cl);
-}