diff options
| author | bors <bors@rust-lang.org> | 2018-03-11 13:40:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-11 13:40:13 +0000 |
| commit | 5f2efb09358c1c43ff0f8be11c00948478777e23 (patch) | |
| tree | 4920072378172ed3a0759a2f33688abdfb5305db | |
| parent | e5acb0c8f69d615b46c8e3eed4c84c3abd6fd0cd (diff) | |
| parent | c67e55338442071666da7fb310b064b8e31fbacb (diff) | |
| download | rust-5f2efb09358c1c43ff0f8be11c00948478777e23.tar.gz rust-5f2efb09358c1c43ff0f8be11c00948478777e23.zip | |
Auto merge of #48907 - kennytm:minor-ci-stuff, r=alexcrichton
Some minor CI changes 1. On macOS, ensure crash log printing won't error, and only real crash logs are printed. This may avoid the `find` process exiting abnormally and truncated the Travis log (I guess). 2. Print `/proc/cpuinfo` and `/proc/meminfo`. To determine if there's any variation in the reported clock rate between jobs.
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | src/ci/run.sh | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 5bd34baec1f..41ea0c9afa8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -275,11 +275,12 @@ after_failure: - ls -lat $HOME/Library/Logs/DiagnosticReports/ - find $HOME/Library/Logs/DiagnosticReports -type f + -name '*.crash' -not -name '*.stage2-*.crash' -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash' -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \; -exec head -750 {} \; - -exec echo travis_fold":"end:crashlog \; + -exec echo travis_fold":"end:crashlog \; || true # attempt to debug anything killed by the oom killer on linux, just to see if # it happened diff --git a/src/ci/run.sh b/src/ci/run.sh index 79300e08a7d..7ce50d5c200 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -91,11 +91,19 @@ make check-bootstrap travis_fold end check-bootstrap travis_time_finish +# Display the CPU and memory information. This helps us know why the CI timing +# is fluctuating. +travis_fold start log-system-info if [ "$TRAVIS_OS_NAME" = "osx" ]; then + system_profiler SPHardwareDataType || true + sysctl hw || true ncpus=$(sysctl -n hw.ncpu) else + cat /proc/cpuinfo || true + cat /proc/meminfo || true ncpus=$(grep processor /proc/cpuinfo | wc -l) fi +travis_fold end log-system-info if [ ! -z "$SCRIPT" ]; then sh -x -c "$SCRIPT" |