thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build and tests on Fedora (#3496)

Browse Source 
* Fix some tests and build on Fedora 28

* Update contrib/ssl

* Try `sudo` first, then without `sudo`.
This commit is contained in:
abyss7 2018-10-30 17:05:44 +03:00 committed by proller
parent 604ba01ab5
commit d538f70679
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -246,3 +246,6 @@ website/presentations
website/package-lock.json
.DS_Store
*/.DS_Store
# Ignore files for locally disabled tests
/dbms/tests/queries/**/*.disabled

2
contrib/ssl vendored

@ -1 +1 @@
Subproject commit de02224a42c69e3d8c9112c82018816f821878d0
Subproject commit 919f6f1331d500bfdd26f8bbbf88e92c0119879b

2
dbms/tests/CMakeLists.txt
View File

@ -27,7 +27,7 @@ if (ENABLE_TESTS)
# maybe add --no-long ?
# if you want disable some tests: env TEST_OPT0='--skip compile'
add_test(NAME with_server COMMAND bash -c "env BUILD_DIR=${ClickHouse_BINARY_DIR} INTERNAL_COMPILER_BIN_ROOT=${INTERNAL_COMPILER_BIN_ROOT} ${CMAKE_CURRENT_SOURCE_DIR}/clickhouse-test-server")
add_test(NAME with_server COMMAND bash -c "env BUILD_DIR=${ClickHouse_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/clickhouse-test-server")
endif ()
if (ENABLE_TEST_INTEGRATION)

2
dbms/tests/queries/0_stateless/00417_system_build_options.sh
View File

@ -3,4 +3,4 @@
CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
. $CURDIR/../shell_config.sh
$CLICKHOUSE_CLIENT --query="SELECT * FROM system.build_options" | perl -lnE 'print $1 if /(BUILD_DATE|BUILD_TYPE|CXX_COMPILER|CXX_FLAGS|LINK_FLAGS)\s+\S+/';
$CLICKHOUSE_CLIENT --query="SELECT * FROM system.build_options" | perl -lnE 'print $1 if /(BUILD_DATE|BUILD_TYPE|CXX_COMPILER)\s+\S+/ || /(CXX_FLAGS|LINK_FLAGS)/';

8
dbms/tests/queries/0_stateless/00428_partition.sh
View File

@ -18,14 +18,18 @@ $chl "INSERT INTO test.partition_428 (p, k) VALUES(toDate(31), 1)"
$chl "INSERT INTO test.partition_428 (p, k) VALUES(toDate(1), 2)"
for part in `$chl "SELECT name FROM system.parts WHERE database='test' AND table='partition_428'"`; do
sudo -n cat $ch_dir/data/test/partition_428/$part/columns.txt | wc -l # 2 header lines + 3 columns
# 2 header lines + 3 columns
(sudo -n cat $ch_dir/data/test/partition_428/$part/columns.txt 2>/dev/null || \
cat $ch_dir/data/test/partition_428/$part/columns.txt) | wc -l
done
$chl "ALTER TABLE test.partition_428 DETACH PARTITION 197001"
$chl "ALTER TABLE test.partition_428 ATTACH PARTITION 197001"
for part in `$chl "SELECT name FROM system.parts WHERE database='test' AND table='partition_428'"`; do
sudo -n cat $ch_dir/data/test/partition_428/$part/columns.txt | wc -l # 2 header lines + 3 columns
# 2 header lines + 3 columns
(sudo -n cat $ch_dir/data/test/partition_428/$part/columns.txt 2>/dev/null || \
cat $ch_dir/data/test/partition_428/$part/columns.txt) | wc -l
done
$chl "ALTER TABLE test.partition_428 MODIFY COLUMN v1 Int8"

1
libs/libcommon/include/common/readline_use.h
View File

@ -10,7 +10,6 @@
#include <readline/history.h>
#elif USE_LIBEDIT
#include <editline/readline.h>
#include <editline/history.h> // Y_IGNORE
#else
#include <string>
#include <cstring>