OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1564 from elly/cargo

Browse Source 
[cargo] refactor test_one_crate
This commit is contained in:
Graydon Hoare 2012-01-18 19:43:03 -08:00
commit 8ebe4169f3
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/cargo/cargo.rs
View File

@ -357,23 +357,37 @@ fn for_each_package(c: cargo, b: block(source, package)) {
// FIXME: deduplicate code with install_one_crate // FIXME: deduplicate code with install_one_crate
fn test_one_crate(c: cargo, _path: str, cf: str, _p: pkg) { fn test_one_crate(c: cargo, _path: str, cf: str, _p: pkg) {
let name = fs::basename(cf); let buildpath = fs::connect(_path, "/test");
let ri = str::index(name, '.' as u8); need_dir(buildpath);
if ri != -1 { #debug("Testing: %s -> %s", cf, buildpath);
name = str::slice(name, 0u, ri as uint); let p = run::program_output("rustc", ["--out-dir", buildpath, "--test",
} cf]);
#debug("Installing: %s", name);
let old = fs::list_dir(".");
let p = run::program_output("rustc", ["--test", name + ".rc"]);
if p.status != 0 { if p.status != 0 {
error(#fmt["rustc failed: %d\n%s\n%s", p.status, p.err, p.out]); error(#fmt["rustc failed: %d\n%s\n%s", p.status, p.err, p.out]);
ret; ret;
} }
let new = fs::list_dir("."); let new = fs::list_dir(buildpath);
let created =
vec::filter::<str>(new, { |n| !vec::member::<str>(n, old) });
let exec_suffix = os::exec_suffix(); let exec_suffix = os::exec_suffix();
for ct: str in created { for ct: str in new {
if (exec_suffix != "" && str::ends_with(ct, exec_suffix)) ||
(exec_suffix == "" && !str::starts_with(ct, "./lib")) {
run::run_program(ct, []);
}
}
}
fn install_one_crate(c: cargo, _path: str, cf: str, _p: pkg) {
let buildpath = fs::connect(_path, "/build");
need_dir(buildpath);
#debug("Installing: %s -> %s", cf, buildpath);
let p = run::program_output("rustc", ["--out-dir", buildpath, cf]);
if p.status != 0 {
error(#fmt["rustc failed: %d\n%s\n%s", p.status, p.err, p.out]);
ret;
}
let new = fs::list_dir(buildpath);
let exec_suffix = os::exec_suffix();
for ct: str in new {
if (exec_suffix != "" && str::ends_with(ct, exec_suffix)) || if (exec_suffix != "" && str::ends_with(ct, exec_suffix)) ||
(exec_suffix == "" && !str::starts_with(ct, "./lib")) { (exec_suffix == "" && !str::starts_with(ct, "./lib")) {
// FIXME: need libstd fs::copy or something // FIXME: need libstd fs::copy or something