This commit is contained in:
Ivan 2021-06-11 18:25:45 +03:00 committed by GitHub
parent 58005a30a8
commit ebce4e8139
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 8 deletions

View File

@ -5,13 +5,13 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
. "$CUR_DIR"/../shell_config.sh
# use $CLICKHOUSE_DATABASE so that clickhouse-test will replace it with default to match .reference
config=$CUR_DIR/config_$CLICKHOUSE_DATABASE
xml_config=$CUR_DIR/config_$CLICKHOUSE_DATABASE.xml
XML_config=$CUR_DIR/config_$CLICKHOUSE_DATABASE.XML
conf_config=$CUR_DIR/config_$CLICKHOUSE_DATABASE.conf
yml_config=$CUR_DIR/config_$CLICKHOUSE_DATABASE.yml
yaml_config=$CUR_DIR/config_$CLICKHOUSE_DATABASE.yaml
ini_config=$CUR_DIR/config_$CLICKHOUSE_DATABASE.ini
config=$CLICKHOUSE_TMP/config_$CLICKHOUSE_DATABASE
xml_config=$CLICKHOUSE_TMP/config_$CLICKHOUSE_DATABASE.xml
XML_config=$CLICKHOUSE_TMP/config_$CLICKHOUSE_DATABASE.XML
conf_config=$CLICKHOUSE_TMP/config_$CLICKHOUSE_DATABASE.conf
yml_config=$CLICKHOUSE_TMP/config_$CLICKHOUSE_DATABASE.yml
yaml_config=$CLICKHOUSE_TMP/config_$CLICKHOUSE_DATABASE.yaml
ini_config=$CLICKHOUSE_TMP/config_$CLICKHOUSE_DATABASE.ini
function cleanup()
{
@ -74,4 +74,4 @@ $CLICKHOUSE_CLIENT --config "$yml_config" -q "select getSetting('max_threads')"
echo 'yaml'
$CLICKHOUSE_CLIENT --config "$yaml_config" -q "select getSetting('max_threads')"
echo 'ini'
$CLICKHOUSE_CLIENT --config "$ini_config" -q "select getSetting('max_threads')" 2>&1 |& sed -e "s#$CUR_DIR##" -e "s#DB::Exception: ##"
$CLICKHOUSE_CLIENT --config "$ini_config" -q "select getSetting('max_threads')" 2>&1 |& sed -e "s#$CLICKHOUSE_TMP##" -e "s#DB::Exception: ##"

View File

@ -38,3 +38,6 @@ $CLICKHOUSE_CLIENT --format Null -nm -q "kill mutation where table = 'data_01900
wait
$CLICKHOUSE_CLIENT -nm -q "select * from data_01900_2"
$CLICKHOUSE_CLIENT -q "drop table data_01900_1"
$CLICKHOUSE_CLIENT -q "drop table data_01900_2"

View File

@ -98,6 +98,7 @@ SKIP_LIST = [
"01561_mann_whitney_scipy",
"01582_distinct_optimization",
"01591_window_functions",
"01594_too_low_memory_limits",
"01599_multiline_input_and_singleline_comments", # expect-test
"01601_custom_tld",
"01606_git_import",
@ -126,6 +127,9 @@ SKIP_LIST = [
"01848_http_insert_segfault",
"01875_ssd_cache_dictionary_decimal256_type",
"01880_remote_ipv6",
"01889_check_row_policy_defined_using_user_function",
"01889_clickhouse_client_config_format",
"01903_ssd_cache_dictionary_array_type",
]