ci: try to improve build times

Author: BurntSushi

bench/run

@@ -9,9 +9,10 @@ if [ $# = 0 ] || [ $1 = '-h' ] || [ $1 = '--help' ]; then
   usage
 fi
 
-# Enable SIMD.
-# export RUSTFLAGS="-C target-feature=+ssse3"
-export RUSTFLAGS="-C target-cpu=native"
+# Enable SIMD, unless we're in CI, then we inherit RUSTLFAGS.
+if [ -z "$TRAVIS_RUST_VERSION" ]; then
+  export RUSTFLAGS="-C target-cpu=native"
+fi
 
 which="$1"
 shift
@@ -29,7 +30,7 @@ case $which in
     exec cargo bench --bench bench --features re-rust-bytes "$@"
     ;;
   re2)
-    exec cargo bench --verbose --bench bench --features re-re2 "$@"
+    exec cargo bench --bench bench --features re-re2 "$@"
     ;;
   pcre1)
     exec cargo bench --bench bench --features re-pcre1 "$@"

ci/after_success.sh

@@ -9,6 +9,7 @@ if [ "$TRAVIS_RUST_VERSION" != "nightly" ] || [ "$TRAVIS_PULL_REQUEST" != "false
   exit 0
 fi
 
+export RUSTFLAGS="-C target-feature=+ssse3"
 env
 
 # Build and upload docs.

ci/script.sh

@@ -2,7 +2,13 @@
 
 # This is the main CI script for testing the regex crate and its sub-crates.
 
-set -e
+set -ex
+
+if [ "$TRAVIS_RUST_VERSION" = "nightly" ]; then
+  # We set this once so that all invocations share this setting. This should
+  # help with build times by avoiding excessive re-compiles.
+  export RUSTFLAGS="-C target-feature=+ssse3"
+fi
 
 # Builds the regex crate and runs tests.
 cargo build --verbose
@@ -17,11 +23,11 @@ if [ "$TRAVIS_RUST_VERSION" = "1.12.0" ]; then
   exit
 fi
 
+# Run tests. If we have nightly, then enable our nightly features.
 if [ "$TRAVIS_RUST_VERSION" = "nightly" ]; then
-  cargo build --verbose --manifest-path regex-debug/Cargo.toml
-  RUSTFLAGS="-C target-feature=+ssse3" cargo test --verbose --features 'simd-accel pattern' --jobs 4
+  cargo test --verbose --features 'simd-accel pattern'
 else
-  cargo test --verbose --jobs 4
+  cargo test --verbose
 fi
 
 # Run a test that confirms the shootout benchmarks are correct.
@@ -37,9 +43,10 @@ cargo build --verbose --manifest-path regex-capi/Cargo.toml
 (cd regex-capi/examples && ./compile && LD_LIBRARY_PATH=../../target/debug ./iter)
 
 # Make sure benchmarks compile. Don't run them though because they take a
-# very long time.
+# very long time. Also, check that we can build the regex-debug tool.
 if [ "$TRAVIS_RUST_VERSION" = "nightly" ]; then
+  cargo build --verbose --manifest-path regex-debug/Cargo.toml
   for x in rust rust-bytes pcre1 onig; do
-    (cd bench && ./run $x --no-run)
+    (cd bench && ./run $x --no-run --verbose)
   done
 fi