Merge pull request #166 from kennytm/fix-travis

Reenable Travis CI.

.travis.yml

@@ -0,0 +1,14 @@
+language: rust
+sudo: false
+
+cache: cargo
+
+rust:
+  - nightly
+
+env:
+  - CHECK='cd collector && ./check-benchmarks.sh'
+  - CHECK='cargo build --verbose && cargo test --verbose'
+
+script:
+  - sh -x -c "$CHECK"

Cargo.toml

@@ -1,8 +1,6 @@
 [workspace]
-members = [
-    "collector",
-    "site",
-]
+members = ["site"] # do not add "collector", otherwise the exclude won't work.
+exclude = ["collector/benchmarks"]
 
 [profile.release]
 debug = true

collector/benchmarks/tuple-stress/makefile

@@ -2,3 +2,5 @@
 
 all:
 	$(CARGO) rustc $(CARGO_OPTS) -- $(CARGO_RUSTC_OPTS)
+patches:
+	@echo ''

collector/check-benchmarks.sh

@@ -1,22 +1,30 @@
 #!/bin/bash
 
-# print what we're doing
-set -x
 # fail if variables are unset
 set -u
 # exit if anything fails
 set -e
 
-for dir in benchmarks/*; do
-    pwd;
+cd benchmarks;
+for dir in *; do
     if [[ -d "$dir" ]]; then
-        cd "$dir";
-        patches=`make patches`;
-        for patch in "" $patches; do
+        cd "$dir"
+        patches=(`make patches`);
+        for patch in "${patches[@]:-}"; do
+            test_name="$dir${patch/@/_}"
+            echo "travis_fold:start:$test_name"
+            echo "travis_time:start:$test_name"
+            echo "Checking $dir$patch..."
+            start_time=$(date -u '+%s%N')
             CARGO=cargo \
             RUSTC=rustc \
             make "all$patch";
+            end_time=$(date -u '+%s%N')
+            duration=$(($end_time-$start_time))
+            echo
+            echo "travis_fold:end:$test_name"
+            echo "travis_time:end:$test_name:start=$start_time,finish=$end_time,duration=$duration"
         done;
-        cd ../..;
+        cd ..;
     fi
 done

site/tests/lib.rs

@@ -1,3 +1,6 @@
+// This test is currently out-of-date. Disabled. See issue #165.
+#![cfg(any())]
+
 #[macro_use]
 extern crate lazy_static;
 #[macro_use]