Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move the trap instruction in /etc/ci/performance/test_all.sh. #19474

Merged
merged 1 commit into from Dec 4, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions etc/ci/performance/test_all.sh
Expand Up @@ -43,6 +43,9 @@ fi
echo "Starting the local server"
python3 -m http.server > /dev/null 2>&1 &

# Stop the local server no matter how we exit the script
trap 'kill $(jobs -pr)' SIGINT SIGTERM EXIT

# TODO: enable the full manifest when #11087 is fixed
# https://github.com/servo/servo/issues/11087
# MANIFEST="page_load_test/tp5n/20160509.manifest"
Expand All @@ -61,5 +64,3 @@ then
python3 submit_to_s3.py "${PERF_FILE}" "${PERF_KEY}"
fi

echo "Stopping the local server"
trap 'kill $(jobs -pr)' SIGINT SIGTERM EXIT