itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run tests in parallel

Browse Source 
Give each test is own root inside of the shared root to ensure that the tests
are still isolated from one another.
This commit is contained in:
Alex Crichton 2014-06-18 13:18:36 -07:00
parent fbfa8bdeca
commit a9d8d2c62a
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -61,7 +61,7 @@ test-unit: target/tests/test-unit
target/tests/test-unit $(only) target/tests/test-unit $(only)
test-integration: target/tests/test-integration test-integration: target/tests/test-integration
RUST_TEST_TASKS=1 $< $(only) $< $(only)
test: test-unit test-integration test: test-unit test-integration

15
tests/support/paths.rs
View File

@ -1,12 +1,21 @@
use std::{io,os};
use std::io::IoResult; use std::io::IoResult;
use std::io::fs; use std::io::fs;
use std::sync::atomics;
use std::{io, os};
use cargo::util::realpath; use cargo::util::realpath;
static CARGO_INTEGRATION_TEST_DIR : &'static str = "cargo-integration-tests"; static CARGO_INTEGRATION_TEST_DIR : &'static str = "cargo-integration-tests";
local_data_key!(task_id: uint)
static mut NEXT_ID: atomics::AtomicUint = atomics::INIT_ATOMIC_UINT;
pub fn root() -> Path { pub fn root() -> Path {
realpath(&os::tmpdir().join(CARGO_INTEGRATION_TEST_DIR)).unwrap() let my_id = *task_id.get().unwrap();
let path = os::tmpdir().join(CARGO_INTEGRATION_TEST_DIR)
.join(format!("test-{}", my_id));
realpath(&path).unwrap()
} }
pub fn home() -> Path { pub fn home() -> Path {
@ -40,6 +49,8 @@ impl PathExt for Path {
* Ensure required test directories exist and are empty * Ensure required test directories exist and are empty
*/ */
pub fn setup() { pub fn setup() {
let my_id = unsafe { NEXT_ID.fetch_add(1, atomics::SeqCst) };
task_id.replace(Some(my_id));
debug!("path setup; root={}; home={}", root().display(), home().display()); debug!("path setup; root={}; home={}", root().display(), home().display());
root().rm_rf().unwrap(); root().rm_rf().unwrap();
home().mkdir_p().unwrap(); home().mkdir_p().unwrap();