Skip to content

Commit bbcfded

Browse files
Merge pull request #166 from kennytm/fix-travis
Reenable Travis CI.
2 parents 6b34046 + 24dfad0 commit bbcfded

File tree

7 files changed

+37
-26
lines changed

7 files changed

+37
-26
lines changed

.travis.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
language: rust
2+
sudo: false
3+
4+
cache: cargo
5+
6+
rust:
7+
- nightly
8+
9+
env:
10+
- CHECK='cd collector && ./check-benchmarks.sh'
11+
- CHECK='cargo build --verbose && cargo test --verbose'
12+
13+
script:
14+
- sh -x -c "$CHECK"

Cargo.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
[workspace]
2-
members = [
3-
"collector",
4-
"site",
5-
]
2+
members = ["site"] # do not add "collector", otherwise the exclude won't work.
3+
exclude = ["collector/benchmarks"]
64

75
[profile.release]
86
debug = true

collector/.travis.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

collector/benchmarks/tuple-stress/makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22

33
all:
44
$(CARGO) rustc $(CARGO_OPTS) -- $(CARGO_RUSTC_OPTS)
5+
patches:
6+
@echo ''

collector/check-benchmarks.sh

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,30 @@
11
#!/bin/bash
22

3-
# print what we're doing
4-
set -x
53
# fail if variables are unset
64
set -u
75
# exit if anything fails
86
set -e
97

10-
for dir in benchmarks/*; do
11-
pwd;
8+
cd benchmarks;
9+
for dir in *; do
1210
if [[ -d "$dir" ]]; then
13-
cd "$dir";
14-
patches=`make patches`;
15-
for patch in "" $patches; do
11+
cd "$dir"
12+
patches=(`make patches`);
13+
for patch in "${patches[@]:-}"; do
14+
test_name="$dir${patch/@/_}"
15+
echo "travis_fold:start:$test_name"
16+
echo "travis_time:start:$test_name"
17+
echo "Checking $dir$patch..."
18+
start_time=$(date -u '+%s%N')
1619
CARGO=cargo \
1720
RUSTC=rustc \
1821
make "all$patch";
22+
end_time=$(date -u '+%s%N')
23+
duration=$(($end_time-$start_time))
24+
echo
25+
echo "travis_fold:end:$test_name"
26+
echo "travis_time:end:$test_name:start=$start_time,finish=$end_time,duration=$duration"
1927
done;
20-
cd ../..;
28+
cd ..;
2129
fi
2230
done

site/.travis.yml

Lines changed: 0 additions & 8 deletions
This file was deleted.

site/tests/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// This test is currently out-of-date. Disabled. See issue #165.
2+
#![cfg(any())]
3+
14
#[macro_use]
25
extern crate lazy_static;
36
#[macro_use]

0 commit comments

Comments
 (0)