diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-01-23 17:48:07 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-23 17:48:07 -0600 |
commit | 2024ef56b00d4fce0c173f4d47474d97d767379d (patch) | |
tree | d9747b8ee0a363f060b6927b2b112139228899a3 | |
parent | 4307b6e67b0cb35e2afc46ba0b64e7bc5bde1bdf (diff) | |
parent | c3e2ce0624e8cb34dc14b6502d8801408d735966 (diff) | |
download | servo-2024ef56b00d4fce0c173f4d47474d97d767379d.tar.gz servo-2024ef56b00d4fce0c173f4d47474d97d767379d.zip |
Auto merge of #19820 - asajeffrey:test-perf-run-warc-tests, r=jdm
Run servo-warc-tests as part of test-perf
<!-- Please describe your changes on the following line: -->
Run the servo-warc-tests as part of performance testing.
Depends on https://github.com/servo/servo-warc-tests/pull/1
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because this is adding more test infrastructure
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19820)
<!-- Reviewable:end -->
-rw-r--r-- | etc/ci/performance/.gitignore | 1 | ||||
-rwxr-xr-x | etc/ci/performance/test_perf.sh | 16 |
2 files changed, 16 insertions, 1 deletions
diff --git a/etc/ci/performance/.gitignore b/etc/ci/performance/.gitignore index 2f10274f854..9692a875c28 100644 --- a/etc/ci/performance/.gitignore +++ b/etc/ci/performance/.gitignore @@ -4,6 +4,7 @@ output/* .cache/* page_load_test/tp5n/* page_load_test/tp5n.zip +servo-warc-tests/* venv/* __pycache__/ diff --git a/etc/ci/performance/test_perf.sh b/etc/ci/performance/test_perf.sh index 0b0a846ed30..b2b7adc1594 100755 --- a/etc/ci/performance/test_perf.sh +++ b/etc/ci/performance/test_perf.sh @@ -26,13 +26,27 @@ else echo "Found existing test cases, skipping download and unzip." fi +WARC_DIR="./servo-warc-tests" +WARC_REPO="git@github.com:servo/servo-warc-tests.git" + +# Clone the warc tests if they don't exist +if [[ ! -d ${WARC_DIR} ]]; then + git clone ${WARC_REPO} +fi + +# Make sure we're running with an up-to-date warc test repo +git -C ${WARC_DIR} pull + virtualenv venv --python="$(which python3)" PS1="" source venv/bin/activate # `PS1` must be defined before activating virtualenv -pip install "boto3>=1.4.0" +pip install \ + "boto3>=1.4.0" \ + git+https://github.com/ikreymer/pywb.git mkdir -p servo mkdir -p output # Test result will be saved to output/perf-<timestamp>.json ./git_log_to_json.sh > servo/revision.json ./test_all.sh --servo ${*} +SERVO_DIR="../../.." ${WARC_DIR}/run-warc-tests.sh |