thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid using symlinks for top_level_domains

Browse Source 
Move the main copy into the tests/config and ship it to the perf tests
via the perf package.
This commit is contained in:
Azat Khuzhin 2020-12-15 21:48:24 +03:00
parent 01286a6a09
commit 95c35b318e
4 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/packager/binary/build.sh
View File

@ -31,6 +31,7 @@ find . -name '*.so.*' -print -exec mv '{}' /output \;
if [ "performance" == "$COMBINED_OUTPUT" ] if [ "performance" == "$COMBINED_OUTPUT" ]
then then
cp -r ../tests/performance /output cp -r ../tests/performance /output
cp -r ../tests/config/top_level_domains /
cp -r ../docker/test/performance-comparison/config /output ||: cp -r ../docker/test/performance-comparison/config /output ||:
rm /output/unit_tests_dbms ||: rm /output/unit_tests_dbms ||:
rm /output/clickhouse-odbc-bridge ||: rm /output/clickhouse-odbc-bridge ||:

10
tests/CMakeLists.txt
View File

@ -15,16 +15,6 @@ install (
COMPONENT clickhouse COMPONENT clickhouse
PATTERN "CMakeLists.txt" EXCLUDE PATTERN "CMakeLists.txt" EXCLUDE
PATTERN ".gitignore" 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) install (FILES server-test.xml DESTINATION ${CLICKHOUSE_ETC_DIR}/clickhouse-server COMPONENT clickhouse)

1
tests/config/top_level_domains
View File

@ -1 +0,0 @@
../../docker/test/performance-comparison/config/top_level_domains

0
docker/test/performance-comparison/config/top_level_domains/public_suffix_list.dat → tests/config/top_level_domains/public_suffix_list.dat
View File