From 95c35b318e55362c9a18d2ea723092ef9fc1f02f Mon Sep 17 00:00:00 2001 From: Azat Khuzhin Date: Tue, 15 Dec 2020 21:48:24 +0300 Subject: [PATCH] Avoid using symlinks for top_level_domains Move the main copy into the tests/config and ship it to the perf tests via the perf package. --- docker/packager/binary/build.sh | 1 + tests/CMakeLists.txt | 10 ---------- tests/config/top_level_domains | 1 - .../config/top_level_domains/public_suffix_list.dat | 0 4 files changed, 1 insertion(+), 11 deletions(-) delete mode 120000 tests/config/top_level_domains rename {docker/test/performance-comparison => tests}/config/top_level_domains/public_suffix_list.dat (100%) diff --git a/docker/packager/binary/build.sh b/docker/packager/binary/build.sh index 4ba2f5f87c7..c46e3b23994 100755 --- a/docker/packager/binary/build.sh +++ b/docker/packager/binary/build.sh @@ -31,6 +31,7 @@ find . -name '*.so.*' -print -exec mv '{}' /output \; if [ "performance" == "$COMBINED_OUTPUT" ] then cp -r ../tests/performance /output + cp -r ../tests/config/top_level_domains / cp -r ../docker/test/performance-comparison/config /output ||: rm /output/unit_tests_dbms ||: rm /output/clickhouse-odbc-bridge ||: diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9e5a2e29dc9..3ef09e5658f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -15,16 +15,6 @@ install ( COMPONENT clickhouse PATTERN "CMakeLists.txt" EXCLUDE PATTERN ".gitignore" EXCLUDE - PATTERN "top_level_domains" EXCLUDE -) - -# Dereference symlink -get_filename_component(TOP_LEVEL_DOMAINS_ABS_DIR config/top_level_domains REALPATH) -install ( - DIRECTORY "${TOP_LEVEL_DOMAINS_ABS_DIR}" - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/clickhouse-test/config - USE_SOURCE_PERMISSIONS - COMPONENT clickhouse ) install (FILES server-test.xml DESTINATION ${CLICKHOUSE_ETC_DIR}/clickhouse-server COMPONENT clickhouse) diff --git a/tests/config/top_level_domains b/tests/config/top_level_domains deleted file mode 120000 index 7e12ab4ba2c..00000000000 --- a/tests/config/top_level_domains +++ /dev/null @@ -1 +0,0 @@ -../../docker/test/performance-comparison/config/top_level_domains \ No newline at end of file diff --git a/docker/test/performance-comparison/config/top_level_domains/public_suffix_list.dat b/tests/config/top_level_domains/public_suffix_list.dat similarity index 100% rename from docker/test/performance-comparison/config/top_level_domains/public_suffix_list.dat rename to tests/config/top_level_domains/public_suffix_list.dat