Commit f6029fb9 authored by Random-Liu's avatar Random-Liu

Handle interrupt properly, wrap focus and skip with quote.

parent d9ddd64c
...@@ -38,11 +38,11 @@ if [[ $parallelism > 1 ]]; then ...@@ -38,11 +38,11 @@ if [[ $parallelism > 1 ]]; then
fi fi
if [[ $focus != "" ]]; then if [[ $focus != "" ]]; then
ginkgoflags="$ginkgoflags -focus=$focus " ginkgoflags="$ginkgoflags -focus='$focus' "
fi fi
if [[ $skip != "" ]]; then if [[ $skip != "" ]]; then
ginkgoflags="$ginkgoflags -skip=$skip " ginkgoflags="$ginkgoflags -skip='$skip' "
fi fi
if [[ $run_until_failure != "" ]]; then if [[ $run_until_failure != "" ]]; then
...@@ -130,7 +130,7 @@ if [ $remote = true ] ; then ...@@ -130,7 +130,7 @@ if [ $remote = true ] ; then
--results-dir="$artifacts" --ginkgo-flags="$ginkgoflags" \ --results-dir="$artifacts" --ginkgo-flags="$ginkgoflags" \
--image-project="$image_project" --instance-name-prefix="$instance_prefix" --setup-node="true" \ --image-project="$image_project" --instance-name-prefix="$instance_prefix" --setup-node="true" \
--delete-instances="$delete_instances" --test_args="$test_args" --instance-metadata="$metadata" \ --delete-instances="$delete_instances" --test_args="$test_args" --instance-metadata="$metadata" \
2>&1 | tee "${artifacts}/build-log.txt" 2>&1 | tee -i "${artifacts}/build-log.txt"
exit $? exit $?
else else
...@@ -149,6 +149,6 @@ else ...@@ -149,6 +149,6 @@ else
# Provided for backwards compatibility # Provided for backwards compatibility
go run test/e2e_node/runner/local/run_local.go --ginkgo-flags="$ginkgoflags" \ go run test/e2e_node/runner/local/run_local.go --ginkgo-flags="$ginkgoflags" \
--test-flags="--alsologtostderr --v 4 --report-dir=${artifacts} --node-name $(hostname) \ --test-flags="--alsologtostderr --v 4 --report-dir=${artifacts} --node-name $(hostname) \
$test_args" --build-dependencies=true 2>&1 | tee "${artifacts}/build-log.txt" $test_args" --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt"
exit $? exit $?
fi fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment