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

Merge pull request #8142 from ClickHouse/fix_coverage

Browse Source 
Fix coverage
This commit is contained in:
alesapin 2019-12-12 11:58:07 +03:00 committed by GitHub
commit fbf07e9fff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/test/coverage/Dockerfile
View File

@ -12,7 +12,7 @@ RUN apt-get --allow-unauthenticated update -y \
software-properties-common
RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic main" >> /etc/apt/sources.list
RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main" >> /etc/apt/sources.list
RUN apt-get --allow-unauthenticated update -y \
&& env DEBIAN_FRONTEND=noninteractive \
@ -29,7 +29,7 @@ ENV OUTPUT_DIR=/output
ENV IGNORE='.*contrib.*'
CMD mkdir -p /build/obj-x86_64-linux-gnu && cd /build/obj-x86_64-linux-gnu && CC=clang-7 CXX=clang++-7 cmake .. && cd /; \
CMD mkdir -p /build/obj-x86_64-linux-gnu && cd /build/obj-x86_64-linux-gnu && CC=clang-8 CXX=clang++-8 cmake .. && cd /; \
dpkg -i /package_folder/clickhouse-common-static_*.deb; \
llvm-profdata-9 merge -sparse ${COVERAGE_DIR}/* -o clickhouse.profdata && \
llvm-cov-9 export /usr/bin/clickhouse -instr-profile=clickhouse.profdata -j=16 -format=lcov -skip-functions -ignore-filename-regex $IGNORE > output.lcov && \

16
docker/test/stateful_with_coverage/run.sh
View File

@ -1,11 +1,17 @@
#!/bin/bash
kill_clickhouse () {
while kill -0 `pgrep -u clickhouse`;
kill `pgrep -u clickhouse` 2>/dev/null
for i in {1..10}
do
kill `pgrep -u clickhouse` 2>/dev/null
echo "Process" `pgrep -u clickhouse` "still alive"
sleep 10
if ! kill -0 `pgrep -u clickhouse`; then
echo "No clickhouse process"
break
else
echo "Process" `pgrep -u clickhouse` "still alive"
sleep 10
fi
done
}
@ -16,7 +22,7 @@ start_clickhouse () {
wait_llvm_profdata () {
while kill -0 `pgrep llvm-profdata-9`;
do
echo "Waiting for profdata " `pgrep llvm-profdata-9` "still alive"
echo "Waiting for profdata" `pgrep llvm-profdata-9` "still alive"
sleep 3
done
}

16
docker/test/stateless_with_coverage/run.sh
View File

@ -1,18 +1,24 @@
#!/bin/bash
kill_clickhouse () {
while kill -0 `pgrep -u clickhouse`;
kill `pgrep -u clickhouse` 2>/dev/null
for i in {1..10}
do
kill `pgrep -u clickhouse` 2>/dev/null
echo "Process" `pgrep -u clickhouse` "still alive"
sleep 10
if ! kill -0 `pgrep -u clickhouse`; then
echo "No clickhouse process"
break
else
echo "Process" `pgrep -u clickhouse` "still alive"
sleep 10
fi
done
}
wait_llvm_profdata () {
while kill -0 `pgrep llvm-profdata-9`;
do
echo "Waiting for profdata " `pgrep llvm-profdata-9` "still alive"
echo "Waiting for profdata" `pgrep llvm-profdata-9` "still alive"
sleep 3
done
}