From dae5087fcfb628adcedd894d1e20253179677070 Mon Sep 17 00:00:00 2001 From: proller Date: Mon, 17 Jun 2019 19:50:31 +0300 Subject: [PATCH] Build and test fixes --- dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp | 7 +++++++ dbms/tests/clickhouse-test | 11 ++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp b/dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp index 9a9a8d9a536..b3f2e3f86b2 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp +++ b/dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp @@ -400,12 +400,19 @@ void MergeTreeDataPart::remove() const { /// Remove each expected file in directory, then remove directory itself. +#if !__clang__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-variable" +#endif for (const auto & [file, _] : checksums.files) { String path_to_remove = to + "/" + file; if (0 != unlink(path_to_remove.c_str())) throwFromErrno("Cannot unlink file " + path_to_remove, ErrorCodes::CANNOT_UNLINK); } +#if !__clang__ +#pragma GCC diagnostic pop +#endif for (const auto & file : {"checksums.txt", "columns.txt"}) { diff --git a/dbms/tests/clickhouse-test b/dbms/tests/clickhouse-test index db5f5a33a08..f9b6cca9e02 100755 --- a/dbms/tests/clickhouse-test +++ b/dbms/tests/clickhouse-test @@ -54,8 +54,8 @@ def run_single_test(args, ext, server_logs_level, case_file, stdout_file, stderr sleep(0.01) # Normalize randomized database names in stdout, stderr files. - os.system("sed -i 's/{test_db}/default/g' {file}".format(test_db=args.database, file=stdout_file)) - os.system("sed -i 's/{test_db}/default/g' {file}".format(test_db=args.database, file=stderr_file)) + os.system("sed -i -e 's/{test_db}/default/g' {file}".format(test_db=args.database, file=stdout_file)) + os.system("sed -i -e 's/{test_db}/default/g' {file}".format(test_db=args.database, file=stderr_file)) stdout = open(stdout_file, 'r').read() if os.path.exists(stdout_file) else '' stdout = unicode(stdout, errors='replace', encoding='utf-8') @@ -416,7 +416,12 @@ def find_binary(name): return True # maybe it wasn't in PATH - return os.access(os.path.join('/usr/bin', name), os.X_OK) + if os.access(os.path.join('/usr/local/bin', name), os.X_OK): + return True + if os.access(os.path.join('/usr/bin', name), os.X_OK): + return True + return False + if __name__ == '__main__': parser=ArgumentParser(description='ClickHouse functional tests')