summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Makefile.am34
-rw-r--r--src/test/cls_lock/test_cls_lock.cc2
-rw-r--r--src/test/cls_rbd/test_cls_rbd.cc2
-rw-r--r--src/test/cls_refcount/test_cls_refcount.cc2
-rw-r--r--src/test/cls_rgw/test_cls_rgw.cc2
-rw-r--r--src/test/librados/aio.cc (renamed from src/test/rados-api/aio.cc)2
-rw-r--r--src/test/librados/cls.cc (renamed from src/test/rados-api/cls.cc)2
-rw-r--r--src/test/librados/io.cc (renamed from src/test/rados-api/io.cc)2
-rw-r--r--src/test/librados/list.cc (renamed from src/test/rados-api/list.cc)2
-rw-r--r--src/test/librados/misc.cc (renamed from src/test/rados-api/misc.cc)2
-rw-r--r--src/test/librados/pool.cc (renamed from src/test/rados-api/pool.cc)2
-rw-r--r--src/test/librados/snapshots.cc (renamed from src/test/rados-api/snapshots.cc)2
-rw-r--r--src/test/librados/stat.cc (renamed from src/test/rados-api/stat.cc)2
-rw-r--r--src/test/librados/test.cc (renamed from src/test/rados-api/test.cc)2
-rw-r--r--src/test/librados/test.h (renamed from src/test/rados-api/test.h)0
-rw-r--r--src/test/librados/watch_notify.cc (renamed from src/test/rados-api/watch_notify.cc)2
-rw-r--r--src/test/librbd/test_librbd.cc2
-rw-r--r--src/test/multi_stress_watch.cc2
-rw-r--r--src/test/osd/RadosModel.h2
-rw-r--r--src/test/test_stress_watch.cc2
20 files changed, 35 insertions, 35 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 81fd1aa262f..1ddc7368924 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -244,7 +244,7 @@ kvstorebench_SOURCES = test/kv_store_bench.cc key_value_store/kv_flat_btree_asyn
kvstorebench_LDADD = librados.la $(LIBGLOBAL_LDA)
bin_DEBUGPROGRAMS += kvstorebench
-multi_stress_watch_SOURCES = test/multi_stress_watch.cc test/rados-api/test.cc
+multi_stress_watch_SOURCES = test/multi_stress_watch.cc test/librados/test.cc
multi_stress_watch_LDADD = librados.la $(LIBGLOBAL_LDA)
bin_DEBUGPROGRAMS += multi_stress_watch
@@ -807,7 +807,7 @@ unittest_texttable_LDADD = librados.la ${UNITTEST_LDADD}
unittest_texttable_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
check_PROGRAMS += unittest_texttable
-test_librbd_SOURCES = test/librbd/test_librbd.cc test/rados-api/test.cc
+test_librbd_SOURCES = test/librbd/test_librbd.cc test/librados/test.cc
test_librbd_LDADD = librbd.la librados.la ${UNITTEST_STATIC_LDADD}
test_librbd_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
bin_DEBUGPROGRAMS += test_librbd
@@ -818,7 +818,7 @@ test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
bin_DEBUGPROGRAMS += test_librbd_fsx
test_cls_rbd_SOURCES = test/cls_rbd/test_cls_rbd.cc \
- test/rados-api/test.cc \
+ test/librados/test.cc \
cls/rbd/cls_rbd_client.cc \
cls/lock/cls_lock_client.cc \
cls/lock/cls_lock_types.cc \
@@ -828,12 +828,12 @@ test_cls_rbd_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
bin_DEBUGPROGRAMS += test_cls_rbd
test_cls_refcount_SOURCES = test/cls_refcount/test_cls_refcount.cc \
- test/rados-api/test.cc
+ test/librados/test.cc
test_cls_refcount_LDADD = librados.la libcls_refcount_client.a ${UNITTEST_STATIC_LDADD}
test_cls_refcount_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
bin_DEBUGPROGRAMS += test_cls_refcount
-test_cls_lock_SOURCES = test/cls_lock/test_cls_lock.cc test/rados-api/test.cc
+test_cls_lock_SOURCES = test/cls_lock/test_cls_lock.cc test/librados/test.cc
test_cls_lock_LDFLAGS = ${AM_LDFLAGS}
test_cls_lock_LDADD = libcls_lock_client.a librados.la ${UNITTEST_STATIC_LDADD}
test_cls_lock_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
@@ -842,62 +842,62 @@ bin_DEBUGPROGRAMS += test_cls_lock
if WITH_RADOSGW
test_cls_rgw_SOURCES = test/cls_rgw/test_cls_rgw.cc \
- test/rados-api/test.cc
+ test/librados/test.cc
test_cls_rgw_LDADD = librados.la libcls_rgw_client.a ${UNITTEST_STATIC_LDADD}
test_cls_rgw_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
bin_DEBUGPROGRAMS += test_cls_rgw
endif
-test_rados_api_io_SOURCES = test/rados-api/io.cc test/rados-api/test.cc
+test_rados_api_io_SOURCES = test/librados/io.cc test/librados/test.cc
test_rados_api_io_LDFLAGS = ${AM_LDFLAGS}
test_rados_api_io_LDADD = librados.la ${UNITTEST_STATIC_LDADD}
test_rados_api_io_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
bin_DEBUGPROGRAMS += test_rados_api_io
-test_rados_api_aio_SOURCES = test/rados-api/aio.cc test/rados-api/test.cc
+test_rados_api_aio_SOURCES = test/librados/aio.cc test/librados/test.cc
test_rados_api_aio_LDFLAGS = ${AM_LDFLAGS}
test_rados_api_aio_LDADD = librados.la ${UNITTEST_STATIC_LDADD}
test_rados_api_aio_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
bin_DEBUGPROGRAMS += test_rados_api_aio
-test_rados_api_list_SOURCES = test/rados-api/list.cc test/rados-api/test.cc
+test_rados_api_list_SOURCES = test/librados/list.cc test/librados/test.cc
test_rados_api_list_LDFLAGS = ${AM_LDFLAGS}
test_rados_api_list_LDADD = librados.la ${UNITTEST_STATIC_LDADD}
test_rados_api_list_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
bin_DEBUGPROGRAMS += test_rados_api_list
-test_rados_api_pool_SOURCES = test/rados-api/pool.cc test/rados-api/test.cc
+test_rados_api_pool_SOURCES = test/librados/pool.cc test/librados/test.cc
test_rados_api_pool_LDFLAGS = ${AM_LDFLAGS}
test_rados_api_pool_LDADD = librados.la ${UNITTEST_STATIC_LDADD}
test_rados_api_pool_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
bin_DEBUGPROGRAMS += test_rados_api_pool
-test_rados_api_stat_SOURCES = test/rados-api/stat.cc test/rados-api/test.cc
+test_rados_api_stat_SOURCES = test/librados/stat.cc test/librados/test.cc
test_rados_api_stat_LDFLAGS = ${AM_LDFLAGS}
test_rados_api_stat_LDADD = librados.la ${UNITTEST_STATIC_LDADD}
test_rados_api_stat_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
bin_DEBUGPROGRAMS += test_rados_api_stat
-test_rados_api_watch_notify_SOURCES = test/rados-api/watch_notify.cc test/rados-api/test.cc
+test_rados_api_watch_notify_SOURCES = test/librados/watch_notify.cc test/librados/test.cc
test_rados_api_watch_notify_LDFLAGS = ${AM_LDFLAGS}
test_rados_api_watch_notify_LDADD = librados.la ${UNITTEST_STATIC_LDADD}
test_rados_api_watch_notify_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
bin_DEBUGPROGRAMS += test_rados_api_watch_notify
-test_rados_api_snapshots_SOURCES = test/rados-api/snapshots.cc test/rados-api/test.cc
+test_rados_api_snapshots_SOURCES = test/librados/snapshots.cc test/librados/test.cc
test_rados_api_snapshots_LDFLAGS = ${AM_LDFLAGS}
test_rados_api_snapshots_LDADD = librados.la ${UNITTEST_STATIC_LDADD}
test_rados_api_snapshots_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
bin_DEBUGPROGRAMS += test_rados_api_snapshots
-test_rados_api_cls_SOURCES = test/rados-api/cls.cc test/rados-api/test.cc
+test_rados_api_cls_SOURCES = test/librados/cls.cc test/librados/test.cc
test_rados_api_cls_LDFLAGS = ${AM_LDFLAGS}
test_rados_api_cls_LDADD = librados.la ${UNITTEST_STATIC_LDADD}
test_rados_api_cls_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
bin_DEBUGPROGRAMS += test_rados_api_cls
-test_rados_api_misc_SOURCES = test/rados-api/misc.cc test/rados-api/test.cc
+test_rados_api_misc_SOURCES = test/librados/misc.cc test/librados/test.cc
test_rados_api_misc_LDFLAGS = ${AM_LDFLAGS}
test_rados_api_misc_LDADD = librados.la ${UNITTEST_STATIC_LDADD}
test_rados_api_misc_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
@@ -947,7 +947,7 @@ test_filejournal_LDADD = ${UNITTEST_STATIC_LDADD} $(LIBOS_LDA) $(LIBGLOBAL_LDA)
test_filejournal_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
bin_DEBUGPROGRAMS += test_filejournal
-test_stress_watch_SOURCES = test/test_stress_watch.cc test/rados-api/test.cc
+test_stress_watch_SOURCES = test/test_stress_watch.cc test/librados/test.cc
test_stress_watch_LDFLAGS = ${AM_LDFLAGS}
test_stress_watch_LDADD = librados.la ${UNITTEST_STATIC_LDADD}
test_stress_watch_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
@@ -1845,7 +1845,7 @@ noinst_HEADERS = \
test/system/st_rados_watch.h \
test/system/systest_runnable.h \
test/system/systest_settings.h \
- test/rados-api/test.h \
+ test/librados/test.h \
test/unit.h \
os/ObjectMap.h \
os/DBObjectMap.h \
diff --git a/src/test/cls_lock/test_cls_lock.cc b/src/test/cls_lock/test_cls_lock.cc
index 316bc3f596c..39d3cebde10 100644
--- a/src/test/cls_lock/test_cls_lock.cc
+++ b/src/test/cls_lock/test_cls_lock.cc
@@ -19,7 +19,7 @@
#include "msg/msg_types.h"
#include "include/rados/librados.hpp"
-#include "test/rados-api/test.h"
+#include "test/librados/test.h"
#include "gtest/gtest.h"
using namespace librados;
diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc
index dffa00b7543..6308980f55f 100644
--- a/src/test/cls_rbd/test_cls_rbd.cc
+++ b/src/test/cls_rbd/test_cls_rbd.cc
@@ -10,7 +10,7 @@
#include "cls/rbd/cls_rbd_client.h"
#include "gtest/gtest.h"
-#include "test/rados-api/test.h"
+#include "test/librados/test.h"
#include <errno.h>
#include <string>
diff --git a/src/test/cls_refcount/test_cls_refcount.cc b/src/test/cls_refcount/test_cls_refcount.cc
index 9792e9507b9..79d9c942061 100644
--- a/src/test/cls_refcount/test_cls_refcount.cc
+++ b/src/test/cls_refcount/test_cls_refcount.cc
@@ -5,7 +5,7 @@
#include "cls/refcount/cls_refcount_client.h"
#include "gtest/gtest.h"
-#include "test/rados-api/test.h"
+#include "test/librados/test.h"
#include <errno.h>
#include <string>
diff --git a/src/test/cls_rgw/test_cls_rgw.cc b/src/test/cls_rgw/test_cls_rgw.cc
index 6ec20aeb674..f38a6b5a475 100644
--- a/src/test/cls_rgw/test_cls_rgw.cc
+++ b/src/test/cls_rgw/test_cls_rgw.cc
@@ -5,7 +5,7 @@
#include "cls/rgw/cls_rgw_client.h"
#include "gtest/gtest.h"
-#include "test/rados-api/test.h"
+#include "test/librados/test.h"
#include <errno.h>
#include <string>
diff --git a/src/test/rados-api/aio.cc b/src/test/librados/aio.cc
index 90ef6a63039..4983fee7bc7 100644
--- a/src/test/rados-api/aio.cc
+++ b/src/test/librados/aio.cc
@@ -1,6 +1,6 @@
#include "common/errno.h"
#include "include/rados/librados.h"
-#include "test/rados-api/test.h"
+#include "test/librados/test.h"
#include "include/types.h"
#include "gtest/gtest.h"
diff --git a/src/test/rados-api/cls.cc b/src/test/librados/cls.cc
index e20ee11e406..1f61664b487 100644
--- a/src/test/rados-api/cls.cc
+++ b/src/test/librados/cls.cc
@@ -1,6 +1,6 @@
#include "include/rados/librados.h"
#include "include/rados/librados.hpp"
-#include "test/rados-api/test.h"
+#include "test/librados/test.h"
#include "gtest/gtest.h"
#include <errno.h>
diff --git a/src/test/rados-api/io.cc b/src/test/librados/io.cc
index 1b938102906..e09f1764361 100644
--- a/src/test/rados-api/io.cc
+++ b/src/test/librados/io.cc
@@ -1,6 +1,6 @@
#include "include/rados/librados.h"
#include "include/rados/librados.hpp"
-#include "test/rados-api/test.h"
+#include "test/librados/test.h"
#include <errno.h>
#include "gtest/gtest.h"
diff --git a/src/test/rados-api/list.cc b/src/test/librados/list.cc
index d94aebe2afc..a1bea88260b 100644
--- a/src/test/rados-api/list.cc
+++ b/src/test/librados/list.cc
@@ -1,6 +1,6 @@
#include "include/rados/librados.h"
#include "include/rados/librados.hpp"
-#include "test/rados-api/test.h"
+#include "test/librados/test.h"
#include "gtest/gtest.h"
#include <errno.h>
diff --git a/src/test/rados-api/misc.cc b/src/test/librados/misc.cc
index 5f0545adb60..30b0c3d6d13 100644
--- a/src/test/rados-api/misc.cc
+++ b/src/test/librados/misc.cc
@@ -3,7 +3,7 @@
#include "include/rbd_types.h"
#include "include/rados/librados.h"
#include "include/rados/librados.hpp"
-#include "test/rados-api/test.h"
+#include "test/librados/test.h"
#include "gtest/gtest.h"
#include <errno.h>
diff --git a/src/test/rados-api/pool.cc b/src/test/librados/pool.cc
index 652c1deb788..0dffea1b78c 100644
--- a/src/test/rados-api/pool.cc
+++ b/src/test/librados/pool.cc
@@ -1,5 +1,5 @@
#include "include/rados/librados.h"
-#include "test/rados-api/test.h"
+#include "test/librados/test.h"
#include "gtest/gtest.h"
#include <errno.h>
diff --git a/src/test/rados-api/snapshots.cc b/src/test/librados/snapshots.cc
index 80d1aa9f514..439fe3fd6a8 100644
--- a/src/test/rados-api/snapshots.cc
+++ b/src/test/librados/snapshots.cc
@@ -1,5 +1,5 @@
#include "include/rados/librados.h"
-#include "test/rados-api/test.h"
+#include "test/librados/test.h"
#include <algorithm>
#include <errno.h>
diff --git a/src/test/rados-api/stat.cc b/src/test/librados/stat.cc
index 63cb4446081..3811a3795fb 100644
--- a/src/test/rados-api/stat.cc
+++ b/src/test/librados/stat.cc
@@ -1,6 +1,6 @@
#include "include/rados/librados.h"
#include "include/rados/librados.hpp"
-#include "test/rados-api/test.h"
+#include "test/librados/test.h"
#include <algorithm>
#include <errno.h>
diff --git a/src/test/rados-api/test.cc b/src/test/librados/test.cc
index 9ba9641c2b8..a1aa24c736c 100644
--- a/src/test/rados-api/test.cc
+++ b/src/test/librados/test.cc
@@ -1,6 +1,6 @@
#include "include/rados/librados.h"
#include "include/rados/librados.hpp"
-#include "test/rados-api/test.h"
+#include "test/librados/test.h"
#include <sstream>
#include <stdlib.h>
diff --git a/src/test/rados-api/test.h b/src/test/librados/test.h
index df27ba0a687..df27ba0a687 100644
--- a/src/test/rados-api/test.h
+++ b/src/test/librados/test.h
diff --git a/src/test/rados-api/watch_notify.cc b/src/test/librados/watch_notify.cc
index 88dcabfa3bc..b2de96d1332 100644
--- a/src/test/rados-api/watch_notify.cc
+++ b/src/test/librados/watch_notify.cc
@@ -1,6 +1,6 @@
#include "include/rados/librados.h"
#include "include/rados/librados.hpp"
-#include "test/rados-api/test.h"
+#include "test/librados/test.h"
#include <errno.h>
#include <semaphore.h>
diff --git a/src/test/librbd/test_librbd.cc b/src/test/librbd/test_librbd.cc
index 96dcfc2c9bd..80d31a7f9c4 100644
--- a/src/test/librbd/test_librbd.cc
+++ b/src/test/librbd/test_librbd.cc
@@ -31,7 +31,7 @@
#include <algorithm>
#include <sstream>
-#include "rados-api/test.h"
+#include "test/librados/test.h"
#include "common/errno.h"
#include "include/stringify.h"
diff --git a/src/test/multi_stress_watch.cc b/src/test/multi_stress_watch.cc
index bb3349b8e01..eb21bdaa450 100644
--- a/src/test/multi_stress_watch.cc
+++ b/src/test/multi_stress_watch.cc
@@ -1,7 +1,7 @@
// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
#include "include/rados/librados.h"
#include "include/rados/librados.hpp"
-#include "test/rados-api/test.h"
+#include "test/librados/test.h"
#include <semaphore.h>
#include <errno.h>
diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h
index 425c7a61b7a..21112d1067f 100644
--- a/src/test/osd/RadosModel.h
+++ b/src/test/osd/RadosModel.h
@@ -16,7 +16,7 @@
#include "Object.h"
#include "TestOpStat.h"
#include "inttypes.h"
-#include "test/rados-api/test.h"
+#include "test/librados/test.h"
#ifndef RADOSMODEL_H
#define RADOSMODEL_H
diff --git a/src/test/test_stress_watch.cc b/src/test/test_stress_watch.cc
index 44fcdf99105..2192815ab2e 100644
--- a/src/test/test_stress_watch.cc
+++ b/src/test/test_stress_watch.cc
@@ -4,7 +4,7 @@
#include "include/utime.h"
#include "common/Thread.h"
#include "common/Clock.h"
-#include "test/rados-api/test.h"
+#include "test/librados/test.h"
#include "gtest/gtest.h"
#include <semaphore.h>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 04:31:30 +0100