Merge pull request #14950 from apolcyn/log_stuff

Fix c-ares tests under gcc musl
reviewable/pr14727/r4
Jan Tattermusch 7 years ago committed by GitHub
commit b0118b1874
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      templates/test/cpp/naming/resolver_component_tests_defs.include
  2. 1
      templates/tools/dockerfile/test/cxx_alpine_x64/Dockerfile.template
  3. 8
      test/cpp/naming/resolver_component_tests_runner.sh
  4. 1
      tools/dockerfile/test/cxx_alpine_x64/Dockerfile

@ -36,7 +36,8 @@ if [[ "$GRPC_DNS_RESOLVER" != "" && "$GRPC_DNS_RESOLVER" != ares ]]; then
fi fi
export GRPC_DNS_RESOLVER=ares export GRPC_DNS_RESOLVER=ares
"$FLAGS_dns_server_bin_path" --records_config_path="$FLAGS_records_config_path" --port="$FLAGS_dns_server_port" > /dev/null 2>&1 & DNS_SERVER_LOG="$(mktemp)"
"$FLAGS_dns_server_bin_path" --records_config_path="$FLAGS_records_config_path" --port="$FLAGS_dns_server_port" > "$DNS_SERVER_LOG" 2>&1 &
DNS_SERVER_PID=$! DNS_SERVER_PID=$!
echo "Local DNS server started. PID: $DNS_SERVER_PID" echo "Local DNS server started. PID: $DNS_SERVER_PID"
@ -55,8 +56,11 @@ done
if [[ $RETRY == 1 ]]; then if [[ $RETRY == 1 ]]; then
echo "FAILED TO START LOCAL DNS SERVER" echo "FAILED TO START LOCAL DNS SERVER"
kill -SIGTERM "$DNS_SERVER_PID" kill -SIGTERM "$DNS_SERVER_PID" || true
wait wait
echo "========== DNS server log (merged stdout and stderr) ========="
cat "$DNS_SERVER_LOG"
echo "========== end DNS server log ================================"
exit 1 exit 1
fi fi

@ -34,6 +34,7 @@
strace ${'\\'} strace ${'\\'}
python-dev ${'\\'} python-dev ${'\\'}
py-pip ${'\\'} py-pip ${'\\'}
py-yaml ${'\\'}
unzip ${'\\'} unzip ${'\\'}
wget ${'\\'} wget ${'\\'}
zip zip

@ -36,7 +36,8 @@ if [[ "$GRPC_DNS_RESOLVER" != "" && "$GRPC_DNS_RESOLVER" != ares ]]; then
fi fi
export GRPC_DNS_RESOLVER=ares export GRPC_DNS_RESOLVER=ares
"$FLAGS_dns_server_bin_path" --records_config_path="$FLAGS_records_config_path" --port="$FLAGS_dns_server_port" > /dev/null 2>&1 & DNS_SERVER_LOG="$(mktemp)"
"$FLAGS_dns_server_bin_path" --records_config_path="$FLAGS_records_config_path" --port="$FLAGS_dns_server_port" > "$DNS_SERVER_LOG" 2>&1 &
DNS_SERVER_PID=$! DNS_SERVER_PID=$!
echo "Local DNS server started. PID: $DNS_SERVER_PID" echo "Local DNS server started. PID: $DNS_SERVER_PID"
@ -55,8 +56,11 @@ done
if [[ $RETRY == 1 ]]; then if [[ $RETRY == 1 ]]; then
echo "FAILED TO START LOCAL DNS SERVER" echo "FAILED TO START LOCAL DNS SERVER"
kill -SIGTERM "$DNS_SERVER_PID" kill -SIGTERM "$DNS_SERVER_PID" || true
wait wait
echo "========== DNS server log (merged stdout and stderr) ========="
cat "$DNS_SERVER_LOG"
echo "========== end DNS server log ================================"
exit 1 exit 1
fi fi

@ -32,6 +32,7 @@ RUN apk update && apk add \
strace \ strace \
python-dev \ python-dev \
py-pip \ py-pip \
py-yaml \
unzip \ unzip \
wget \ wget \
zip zip

Loading…
Cancel
Save