diff --git a/.travis.yml b/.travis.yml index 726bfdf8f..c53638cb4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,5 @@ cache: - $HOME/.cargo sudo: false script: - - ./.travis_fixup.sh - cargo build - cargo test --no-fail-fast diff --git a/.travis_fixup.sh b/.travis_fixup.sh deleted file mode 100755 index ff1481645..000000000 --- a/.travis_fixup.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -if [ "$CI" != "true" ]; then - exit 1 -fi - -case "$TRAVIS_RUST_VERSION" in - "beta") - skip=$(grep skip_on_beta Cargo.toml | cut -d\" -f 2) - sed -i.org "/skip_on_beta/d" Cargo.toml - ;; - "stable") - skip=$(grep -E "skip_on_beta|skip_on_stable" Cargo.toml | cut -d\" -f 2) - sed -i.org "/skip_on_beta/d" Cargo.toml - sed -i.org "/skip_on_stable/d" Cargo.toml - ;; -esac - -for x in $skip; do - if [ -f tests/$x.rs ]; then - mv tests/$x.rs tests/$x.rs.skip - fi -done - diff --git a/Cargo.toml b/Cargo.toml index f35b2cab2..d5e751f4b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,7 +44,7 @@ generic = [ "expr", "factor", "false", - "fmt", # skip_on_beta + "fmt", "fold", "hashsum", "head", @@ -76,7 +76,7 @@ generic = [ "tail", "tee", "test", - "tr", # skip_on_beta + "tr", "true", "truncate", "tsort",