From d538f706794fd24b89d8e47546dbb6843a163f99 Mon Sep 17 00:00:00 2001
From: abyss7 <5627721+abyss7@users.noreply.github.com>
Date: Tue, 30 Oct 2018 17:05:44 +0300
Subject: [PATCH] Fix build and tests on Fedora (#3496)

* Fix some tests and build on Fedora 28

* Update contrib/ssl

* Try `sudo` first, then without `sudo`.
---
 .gitignore                                                | 3 +++
 contrib/ssl                                               | 2 +-
 dbms/tests/CMakeLists.txt                                 | 2 +-
 .../queries/0_stateless/00417_system_build_options.sh     | 2 +-
 dbms/tests/queries/0_stateless/00428_partition.sh         | 8 ++++++--
 libs/libcommon/include/common/readline_use.h              | 1 -
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6e969a8459c..bc598cf0d0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -246,3 +246,6 @@ website/presentations
 website/package-lock.json
 .DS_Store
 */.DS_Store
+
+# Ignore files for locally disabled tests
+/dbms/tests/queries/**/*.disabled
diff --git a/contrib/ssl b/contrib/ssl
index de02224a42c..919f6f1331d 160000
--- a/contrib/ssl
+++ b/contrib/ssl
@@ -1 +1 @@
-Subproject commit de02224a42c69e3d8c9112c82018816f821878d0
+Subproject commit 919f6f1331d500bfdd26f8bbbf88e92c0119879b
diff --git a/dbms/tests/CMakeLists.txt b/dbms/tests/CMakeLists.txt
index 3f42f94158b..6a983134937 100644
--- a/dbms/tests/CMakeLists.txt
+++ b/dbms/tests/CMakeLists.txt
@@ -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)
diff --git a/dbms/tests/queries/0_stateless/00417_system_build_options.sh b/dbms/tests/queries/0_stateless/00417_system_build_options.sh
index 4de22e36194..4c4b5276a1b 100755
--- a/dbms/tests/queries/0_stateless/00417_system_build_options.sh
+++ b/dbms/tests/queries/0_stateless/00417_system_build_options.sh
@@ -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)/';
diff --git a/dbms/tests/queries/0_stateless/00428_partition.sh b/dbms/tests/queries/0_stateless/00428_partition.sh
index 31e92603024..ce6ad9e1cd8 100755
--- a/dbms/tests/queries/0_stateless/00428_partition.sh
+++ b/dbms/tests/queries/0_stateless/00428_partition.sh
@@ -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"
diff --git a/libs/libcommon/include/common/readline_use.h b/libs/libcommon/include/common/readline_use.h
index 97622b26839..549676ef9b2 100644
--- a/libs/libcommon/include/common/readline_use.h
+++ b/libs/libcommon/include/common/readline_use.h
@@ -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>