This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 23e967b114 Rename cache/test/ to cache/unit_tests/ (#10645)
23e967b114 is described below
commit 23e967b114e9515780a0183e8e28a55e416fc2a6
Author: Masaori Koshiba <[email protected]>
AuthorDate: Fri Oct 20 07:09:28 2023 +0900
Rename cache/test/ to cache/unit_tests/ (#10645)
For consistency with other subsystems
* Rename cache/test/ to cache/unit_tests/
* Fix CacheDir test try lock
---
.gitignore | 2 +-
.../cache/{test => unit_tests}/CacheTestHandler.cc | 0
.../cache/{test => unit_tests}/CacheTestHandler.h | 0
src/iocore/cache/{test => unit_tests}/main.cc | 6 ++--
src/iocore/cache/{test => unit_tests}/main.h | 2 +-
.../cache/{test => unit_tests}/storage.config | 0
src/iocore/cache/{test => unit_tests}/stub.cc | 0
.../{test => unit_tests}/test_Alternate_L_to_S.cc | 0
.../test_Alternate_L_to_S_remove_L.cc | 0
.../test_Alternate_L_to_S_remove_S.cc | 0
.../{test => unit_tests}/test_Alternate_S_to_L.cc | 0
.../test_Alternate_S_to_L_remove_L.cc | 0
.../test_Alternate_S_to_L_remove_S.cc | 0
.../cache/{test => unit_tests}/test_Cache.cc | 0
.../cache/{test => unit_tests}/test_CacheDir.cc | 6 +++-
.../{test => unit_tests}/test_Disk_Failure.cc | 0
.../{test => unit_tests}/test_Disk_Init_Failure.cc | 0
.../{test => unit_tests}/test_Populated_Cache.cc | 0
.../test_Populated_Cache_Disk_Failure.cc | 0
src/iocore/cache/{test => unit_tests}/test_RWW.cc | 0
.../{test => unit_tests}/test_Update_L_to_S.cc | 0
.../{test => unit_tests}/test_Update_S_to_L.cc | 0
.../{test => unit_tests}/test_Update_header.cc | 0
.../var/trafficserver/guard.txt | 0
src/proxy/http/Makefile.am | 2 +-
src/proxy/http/unit_tests/CMakeLists.txt | 2 +-
src/tests/CMakeLists.txt | 38 +++++++++++-----------
27 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8ed8ac5e6e..7db84a3904 100644
--- a/.gitignore
+++ b/.gitignore
@@ -222,4 +222,4 @@ tests/gold_tests/chunked_encoding/smuggle-client
tests/gold_tests/tls/ssl-post
src/iocore/cache/test_*
-src/iocore/cache/test/var/trafficserver/cache.db
+src/iocore/cache/unit_tests/var/trafficserver/cache.db
diff --git a/src/iocore/cache/test/CacheTestHandler.cc
b/src/iocore/cache/unit_tests/CacheTestHandler.cc
similarity index 100%
rename from src/iocore/cache/test/CacheTestHandler.cc
rename to src/iocore/cache/unit_tests/CacheTestHandler.cc
diff --git a/src/iocore/cache/test/CacheTestHandler.h
b/src/iocore/cache/unit_tests/CacheTestHandler.h
similarity index 100%
rename from src/iocore/cache/test/CacheTestHandler.h
rename to src/iocore/cache/unit_tests/CacheTestHandler.h
diff --git a/src/iocore/cache/test/main.cc b/src/iocore/cache/unit_tests/main.cc
similarity index 97%
rename from src/iocore/cache/test/main.cc
rename to src/iocore/cache/unit_tests/main.cc
index 90aafe86ec..740fb53e13 100644
--- a/src/iocore/cache/test/main.cc
+++ b/src/iocore/cache/unit_tests/main.cc
@@ -79,8 +79,8 @@ populate_cache(const swoc::file::path &prefix)
swoc::file::path src_path{TS_ABS_TOP_SRCDIR};
std::error_code ec;
ink_assert(cache_vols == 2);
- swoc::file::copy(src_path /
"src/iocore/cache/test/var/trafficserver/cache.db", prefix /
"var/trafficserver/", ec);
- swoc::file::copy(src_path /
"src/iocore/cache/test/var/trafficserver2/cache.db", prefix /
"var/trafficserver2/", ec);
+ swoc::file::copy(src_path /
"src/iocore/cache/unit_tests/var/trafficserver/cache.db", prefix /
"var/trafficserver/", ec);
+ swoc::file::copy(src_path /
"src/iocore/cache/unit_tests/var/trafficserver2/cache.db", prefix /
"var/trafficserver2/", ec);
}
void
@@ -157,7 +157,7 @@ struct EventProcessorListener :
Catch::TestEventListenerBase {
thread->set_tail_handler(&uring_handler);
#endif
- std::string src_dir = std::string(TS_ABS_TOP_SRCDIR) +
"/src/iocore/cache/test";
+ std::string src_dir = std::string(TS_ABS_TOP_SRCDIR) +
"/src/iocore/cache/unit_tests";
Layout::get()->sysconfdir = src_dir;
}
};
diff --git a/src/iocore/cache/test/main.h b/src/iocore/cache/unit_tests/main.h
similarity index 99%
rename from src/iocore/cache/test/main.h
rename to src/iocore/cache/unit_tests/main.h
index a9b06cc67f..104f092b9e 100644
--- a/src/iocore/cache/test/main.h
+++ b/src/iocore/cache/unit_tests/main.h
@@ -36,7 +36,7 @@
#include "P_AIO.h"
#include "P_CacheDisk.h"
#include "P_Net.h"
-#include "test/CacheTestHandler.h"
+#include "CacheTestHandler.h"
#include "P_Cache.h"
#include <queue>
diff --git a/src/iocore/cache/test/storage.config
b/src/iocore/cache/unit_tests/storage.config
similarity index 100%
rename from src/iocore/cache/test/storage.config
rename to src/iocore/cache/unit_tests/storage.config
diff --git a/src/iocore/cache/test/stub.cc b/src/iocore/cache/unit_tests/stub.cc
similarity index 100%
rename from src/iocore/cache/test/stub.cc
rename to src/iocore/cache/unit_tests/stub.cc
diff --git a/src/iocore/cache/test/test_Alternate_L_to_S.cc
b/src/iocore/cache/unit_tests/test_Alternate_L_to_S.cc
similarity index 100%
rename from src/iocore/cache/test/test_Alternate_L_to_S.cc
rename to src/iocore/cache/unit_tests/test_Alternate_L_to_S.cc
diff --git a/src/iocore/cache/test/test_Alternate_L_to_S_remove_L.cc
b/src/iocore/cache/unit_tests/test_Alternate_L_to_S_remove_L.cc
similarity index 100%
rename from src/iocore/cache/test/test_Alternate_L_to_S_remove_L.cc
rename to src/iocore/cache/unit_tests/test_Alternate_L_to_S_remove_L.cc
diff --git a/src/iocore/cache/test/test_Alternate_L_to_S_remove_S.cc
b/src/iocore/cache/unit_tests/test_Alternate_L_to_S_remove_S.cc
similarity index 100%
rename from src/iocore/cache/test/test_Alternate_L_to_S_remove_S.cc
rename to src/iocore/cache/unit_tests/test_Alternate_L_to_S_remove_S.cc
diff --git a/src/iocore/cache/test/test_Alternate_S_to_L.cc
b/src/iocore/cache/unit_tests/test_Alternate_S_to_L.cc
similarity index 100%
rename from src/iocore/cache/test/test_Alternate_S_to_L.cc
rename to src/iocore/cache/unit_tests/test_Alternate_S_to_L.cc
diff --git a/src/iocore/cache/test/test_Alternate_S_to_L_remove_L.cc
b/src/iocore/cache/unit_tests/test_Alternate_S_to_L_remove_L.cc
similarity index 100%
rename from src/iocore/cache/test/test_Alternate_S_to_L_remove_L.cc
rename to src/iocore/cache/unit_tests/test_Alternate_S_to_L_remove_L.cc
diff --git a/src/iocore/cache/test/test_Alternate_S_to_L_remove_S.cc
b/src/iocore/cache/unit_tests/test_Alternate_S_to_L_remove_S.cc
similarity index 100%
rename from src/iocore/cache/test/test_Alternate_S_to_L_remove_S.cc
rename to src/iocore/cache/unit_tests/test_Alternate_S_to_L_remove_S.cc
diff --git a/src/iocore/cache/test/test_Cache.cc
b/src/iocore/cache/unit_tests/test_Cache.cc
similarity index 100%
rename from src/iocore/cache/test/test_Cache.cc
rename to src/iocore/cache/unit_tests/test_Cache.cc
diff --git a/src/iocore/cache/test/test_CacheDir.cc
b/src/iocore/cache/unit_tests/test_CacheDir.cc
similarity index 98%
rename from src/iocore/cache/test/test_CacheDir.cc
rename to src/iocore/cache/unit_tests/test_CacheDir.cc
index a6d29140c8..c6e32e9ec9 100644
--- a/src/iocore/cache/test/test_CacheDir.cc
+++ b/src/iocore/cache/unit_tests/test_CacheDir.cc
@@ -97,7 +97,11 @@ private:
Vol *vol = gvol[0];
EThread *thread = this_ethread();
MUTEX_TRY_LOCK(lock, vol->mutex, thread);
- ink_release_assert(lock.is_locked());
+ if (!lock.is_locked()) {
+ CONT_SCHED_LOCK_RETRY(this);
+ return;
+ }
+
vol_dir_clear(vol);
// coverity[var_decl]
diff --git a/src/iocore/cache/test/test_Disk_Failure.cc
b/src/iocore/cache/unit_tests/test_Disk_Failure.cc
similarity index 100%
rename from src/iocore/cache/test/test_Disk_Failure.cc
rename to src/iocore/cache/unit_tests/test_Disk_Failure.cc
diff --git a/src/iocore/cache/test/test_Disk_Init_Failure.cc
b/src/iocore/cache/unit_tests/test_Disk_Init_Failure.cc
similarity index 100%
rename from src/iocore/cache/test/test_Disk_Init_Failure.cc
rename to src/iocore/cache/unit_tests/test_Disk_Init_Failure.cc
diff --git a/src/iocore/cache/test/test_Populated_Cache.cc
b/src/iocore/cache/unit_tests/test_Populated_Cache.cc
similarity index 100%
rename from src/iocore/cache/test/test_Populated_Cache.cc
rename to src/iocore/cache/unit_tests/test_Populated_Cache.cc
diff --git a/src/iocore/cache/test/test_Populated_Cache_Disk_Failure.cc
b/src/iocore/cache/unit_tests/test_Populated_Cache_Disk_Failure.cc
similarity index 100%
rename from src/iocore/cache/test/test_Populated_Cache_Disk_Failure.cc
rename to src/iocore/cache/unit_tests/test_Populated_Cache_Disk_Failure.cc
diff --git a/src/iocore/cache/test/test_RWW.cc
b/src/iocore/cache/unit_tests/test_RWW.cc
similarity index 100%
rename from src/iocore/cache/test/test_RWW.cc
rename to src/iocore/cache/unit_tests/test_RWW.cc
diff --git a/src/iocore/cache/test/test_Update_L_to_S.cc
b/src/iocore/cache/unit_tests/test_Update_L_to_S.cc
similarity index 100%
rename from src/iocore/cache/test/test_Update_L_to_S.cc
rename to src/iocore/cache/unit_tests/test_Update_L_to_S.cc
diff --git a/src/iocore/cache/test/test_Update_S_to_L.cc
b/src/iocore/cache/unit_tests/test_Update_S_to_L.cc
similarity index 100%
rename from src/iocore/cache/test/test_Update_S_to_L.cc
rename to src/iocore/cache/unit_tests/test_Update_S_to_L.cc
diff --git a/src/iocore/cache/test/test_Update_header.cc
b/src/iocore/cache/unit_tests/test_Update_header.cc
similarity index 100%
rename from src/iocore/cache/test/test_Update_header.cc
rename to src/iocore/cache/unit_tests/test_Update_header.cc
diff --git a/src/iocore/cache/test/var/trafficserver/guard.txt
b/src/iocore/cache/unit_tests/var/trafficserver/guard.txt
similarity index 100%
rename from src/iocore/cache/test/var/trafficserver/guard.txt
rename to src/iocore/cache/unit_tests/var/trafficserver/guard.txt
diff --git a/src/proxy/http/Makefile.am b/src/proxy/http/Makefile.am
index 28c47ad065..716c6ba227 100644
--- a/src/proxy/http/Makefile.am
+++ b/src/proxy/http/Makefile.am
@@ -172,7 +172,7 @@ test_HttpTransact_LDADD += \
endif
test_HttpTransact_SOURCES = \
- ../../iocore/cache/test/stub.cc \
+ ../../iocore/cache/unit_tests/stub.cc \
unit_tests/main.cc \
unit_tests/test_HttpTransact.cc
diff --git a/src/proxy/http/unit_tests/CMakeLists.txt
b/src/proxy/http/unit_tests/CMakeLists.txt
index d0fcc860b8..3317a593e8 100644
--- a/src/proxy/http/unit_tests/CMakeLists.txt
+++ b/src/proxy/http/unit_tests/CMakeLists.txt
@@ -18,7 +18,7 @@
add_executable(
test_http
main.cc
- "${PROJECT_SOURCE_DIR}/src/iocore/cache/test/stub.cc"
+ "${PROJECT_SOURCE_DIR}/src/iocore/cache/unit_tests/stub.cc"
test_error_page_selection.cc
test_ForwardedConfig.cc
test_HttpTransact.cc
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index d6c2e672ae..7c146b9b0d 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -69,8 +69,8 @@ endif(TS_USE_LINUX_IO_URING)
macro(add_cache_test name)
add_executable(
- ${name} ${CMAKE_SOURCE_DIR}/src/iocore/cache/test/main.cc
${CMAKE_SOURCE_DIR}/src/iocore/cache/test/stub.cc
- ${CMAKE_SOURCE_DIR}/src/iocore/cache/test/CacheTestHandler.cc
${ARGN}
+ ${name} ${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/main.cc
${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/stub.cc
+
${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/CacheTestHandler.cc ${ARGN}
)
target_link_libraries(${name} PRIVATE ts::inknet ts::proxy ts::tsapicore)
add_test(NAME test_cache_${name} COMMAND $<TARGET_FILE:${name}>)
@@ -82,37 +82,37 @@ macro(add_net_test name)
endmacro()
macro(add_stubbed_test name)
- add_executable(${name} ${CMAKE_SOURCE_DIR}/src/iocore/cache/test/stub.cc
${ARGN})
+ add_executable(${name}
${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/stub.cc ${ARGN})
target_link_libraries(${name} PRIVATE ts::proxy ts::http)
add_test(NAME test_stubbed_${name} COMMAND $<TARGET_FILE:${name}>)
endmacro()
-add_cache_test(Cache ${CMAKE_SOURCE_DIR}/src/iocore/cache/test/test_Cache.cc)
-add_cache_test(Populated_Cache
${CMAKE_SOURCE_DIR}/src/iocore/cache/test/test_Populated_Cache.cc)
+add_cache_test(Cache
${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/test_Cache.cc)
+add_cache_test(Populated_Cache
${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/test_Populated_Cache.cc)
if(ENABLE_DISK_FAILURE_TESTS)
foreach(i RANGE 1)
- add_cache_test(Disk_Init_Failure_${i}
${CMAKE_SOURCE_DIR}/src/iocore/cache/test/test_Disk_Init_Failure.cc)
+ add_cache_test(Disk_Init_Failure_${i}
${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/test_Disk_Init_Failure.cc)
target_compile_definitions(Disk_Init_Failure_${i} PUBLIC
FAILURE_INDICES={${i}})
endforeach()
foreach(i RANGE 5 20)
- add_cache_test(Disk_Failure_${i}
${CMAKE_SOURCE_DIR}/src/iocore/cache/test/test_Disk_Failure.cc)
+ add_cache_test(Disk_Failure_${i}
${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/test_Disk_Failure.cc)
target_compile_definitions(Disk_Failure_${i} PUBLIC FAILURE_INDICES={${i}})
endforeach()
add_cache_test(
- Populated_Cache_Disk_Failure
${CMAKE_SOURCE_DIR}/src/iocore/cache/test/test_Populated_Cache_Disk_Failure.cc
+ Populated_Cache_Disk_Failure
${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/test_Populated_Cache_Disk_Failure.cc
)
endif()
-add_cache_test(CacheDir
${CMAKE_SOURCE_DIR}/src/iocore/cache/test/test_CacheDir.cc)
-add_cache_test(RWW ${CMAKE_SOURCE_DIR}/src/iocore/cache/test/test_RWW.cc)
-add_cache_test(Alternate_L_to_S
${CMAKE_SOURCE_DIR}/src/iocore/cache/test/test_Alternate_L_to_S.cc)
-add_cache_test(Alternate_S_to_L
${CMAKE_SOURCE_DIR}/src/iocore/cache/test/test_Alternate_S_to_L.cc)
-add_cache_test(Alternate_L_to_S_remove_L
${CMAKE_SOURCE_DIR}/src/iocore/cache/test/test_Alternate_L_to_S_remove_L.cc)
-add_cache_test(Alternate_L_to_S_remove_S
${CMAKE_SOURCE_DIR}/src/iocore/cache/test/test_Alternate_L_to_S_remove_S.cc)
-add_cache_test(Alternate_S_to_L_remove_L
${CMAKE_SOURCE_DIR}/src/iocore/cache/test/test_Alternate_S_to_L_remove_L.cc)
-add_cache_test(Alternate_S_to_L_remove_S
${CMAKE_SOURCE_DIR}/src/iocore/cache/test/test_Alternate_S_to_L_remove_S.cc)
-add_cache_test(Update_L_to_S
${CMAKE_SOURCE_DIR}/src/iocore/cache/test/test_Update_L_to_S.cc)
-add_cache_test(Update_S_to_L
${CMAKE_SOURCE_DIR}/src/iocore/cache/test/test_Update_S_to_L.cc)
-#add_cache_test(Update_Header
${CMAKE_SOURCE_DIR}/iocore/cache/test/test_Update_Header.cc)
+add_cache_test(CacheDir
${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/test_CacheDir.cc)
+add_cache_test(RWW ${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/test_RWW.cc)
+add_cache_test(Alternate_L_to_S
${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/test_Alternate_L_to_S.cc)
+add_cache_test(Alternate_S_to_L
${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/test_Alternate_S_to_L.cc)
+add_cache_test(Alternate_L_to_S_remove_L
${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/test_Alternate_L_to_S_remove_L.cc)
+add_cache_test(Alternate_L_to_S_remove_S
${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/test_Alternate_L_to_S_remove_S.cc)
+add_cache_test(Alternate_S_to_L_remove_L
${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/test_Alternate_S_to_L_remove_L.cc)
+add_cache_test(Alternate_S_to_L_remove_S
${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/test_Alternate_S_to_L_remove_S.cc)
+add_cache_test(Update_L_to_S
${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/test_Update_L_to_S.cc)
+add_cache_test(Update_S_to_L
${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/test_Update_S_to_L.cc)
+#add_cache_test(Update_Header
${CMAKE_SOURCE_DIR}/src/iocore/cache/unit_tests/test_Update_Header.cc)
add_executable(test_AIO ${CMAKE_SOURCE_DIR}/src/iocore/aio/test_AIO.cc)
add_test(
