diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2017-07-03 20:08:51 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2017-07-03 20:08:51 +0000 |
| commit | baba879fe6d2ee24c001d2ddee86e03b082cd041 (patch) | |
| tree | 2799e08691f3537479795179a7706c265e1924b1 | |
| parent | 1bd18d5830573f21ca196d818a796b90639cfab0 (diff) | |
| parent | d2508e3a447b0b3331cde5003fb8fdd4aaf7c856 (diff) | |
| download | nix-baba879fe6d2ee24c001d2ddee86e03b082cd041.zip | |
Merge #645
645: Use single threads for testing r=asomers
I actually couldn't find a reference to CARGO_TEST_THREADS in the
current cargo codebase, but RUST_TEST_THREADS is definitely correct.
This should reduce some spurious failures on some platforms.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Cross.toml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 6d0b82d1..5f513e71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ sudo: required env: global: - CRATE_NAME=nix - - CARGO_TEST_THREADS=1 + - RUST_TEST_THREADS=1 matrix: # These are all the build jobs. Adjust as necessary. Comment out what you diff --git a/Cross.toml b/Cross.toml new file mode 100644 index 00000000..7c536dc5 --- /dev/null +++ b/Cross.toml @@ -0,0 +1,2 @@ +[build.env] +passthrough = ["RUST_TEST_THREADS"] |