From ae830f61153e079e0ed030351f22cd0fa14abf1a Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 26 Jul 2018 17:41:45 +0200 Subject: [PATCH] dont test cargo miri output on mac. no idea what that system is doing. --- .travis.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 44a124efda3a..865da6f66499 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,11 +32,16 @@ script: - | # Test `cargo miri` cd cargo-miri-test && - MIRI_SYSROOT=~/.xargo/HOST cargo miri -q -- -Zmiri-start-fn >stdout.real 2>stderr.real && - cat stdout.real stderr.real && - # Test `cargo miri` output. - diff stdout.ref stdout.real && - diff stderr.ref stderr.real && + if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + MIRI_SYSROOT=~/.xargo/HOST cargo miri -q -- -Zmiri-start-fn + else + MIRI_SYSROOT=~/.xargo/HOST cargo miri -q -- -Zmiri-start-fn >stdout.real 2>stderr.real && + cat stdout.real stderr.real && + # Test `cargo miri` output. Not on mac because output redirecting doesn't + # work. There is no error. It just stops CI. + diff stdout.ref stdout.real && + diff stderr.ref stderr.real + fi && # Test `cargo miri test` #cargo miri test && cd ..