Skip to content

Commit

Permalink
Fix lots of windows tests
Browse files Browse the repository at this point in the history 
* Add a convenience method bin() for generating the name of a binary. On windows
  this remembers to append `.exe`.

* Stop executing relative paths to binaries and relying on PATH. This is
  suffering from rust-lang/rust#15149 and failing to spawn processes on windows.
  Additionally, this allows the tests to work with a pre-installed cargo becuase
  the freshly built executables are precisely specified.

* A new function, escape_path(), was added for tests. When generated source
  files with paths, this function needs to be called to properly escape the
  \-character that appears in windows path names. Without this function we would
  be generating invalid TOML and rust.
  • Loading branch information
@alexcrichton
alexcrichton committed Jun 25, 2014
1 parent a79aaa4 commit b9ac9dd
Show file tree
Hide file tree
Showing 5 changed files with 112 additions and 94 deletions.
14 changes: 8 additions & 6 deletions src/cargo/core/package_id.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use serialize::{
Decoder
};

use util::{CargoResult, CargoError, FromError};
use util::{CargoResult, CargoError};
use core::source::Location;

trait ToVersion {
Expand Down Expand Up @@ -125,7 +125,7 @@ impl<D: Decoder<Box<CargoError>>> Decodable<D,Box<CargoError>> for PackageId {
PackageId::new(
vector.get(0).as_slice(),
vector.get(1).as_slice(),
&Location::parse(vector.get(2).as_slice()).unwrap())
&try!(Location::parse(vector.get(2).as_slice())))
}
}

Expand All @@ -139,12 +139,14 @@ impl<E, S: Encoder<E>> Encodable<S,E> for PackageId {
#[cfg(test)]
mod tests {
use super::{PackageId, central_repo};
use core::source::Location;

#[test]
fn invalid_version_handled_nicely() {
assert!(PackageId::new("foo", "1.0", central_repo).is_err());
assert!(PackageId::new("foo", "1", central_repo).is_err());
assert!(PackageId::new("foo", "bar", central_repo).is_err());
assert!(PackageId::new("foo", "", central_repo).is_err());
let repo = Location::parse(central_repo).unwrap();
assert!(PackageId::new("foo", "1.0", &repo).is_err());
assert!(PackageId::new("foo", "1", &repo).is_err());
assert!(PackageId::new("foo", "bar", &repo).is_err());
assert!(PackageId::new("foo", "", &repo).is_err());
}
}
14 changes: 11 additions & 3 deletions tests/support/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,14 @@ impl ProjectBuilder {
}

pub fn root(&self) -> Path {
self.root.clone()
self.root.clone()
}

pub fn process(&self, program: &str) -> ProcessBuilder {
pub fn bin(&self, b: &str) -> Path {
self.root.join("target").join(format!("{}{}", b, os::consts::EXE_SUFFIX))
}

pub fn process<T: ToCStr>(&self, program: T) -> ProcessBuilder {
process(program)
.cwd(self.root())
.env("HOME", Some(paths::home().display().to_str().as_slice()))
Expand All @@ -78,7 +82,7 @@ impl ProjectBuilder {

pub fn cargo_process(&self, program: &str) -> ProcessBuilder {
self.build();
self.process(program)
self.process(cargo_dir().join(program))
}

pub fn file<B: BytesContainer, S: Str>(mut self, path: B,
Expand Down Expand Up @@ -347,3 +351,7 @@ impl<T> Tap for T {
self
}
}

pub fn escape_path(p: &Path) -> String {
p.display().to_str().as_slice().replace("\\", "\\\\")
}
102 changes: 55 additions & 47 deletions tests/test_cargo_compile.rs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
use std::io::fs;
use std::os;
use std::path;

use support::{ResultTest,project,execs,main_file};
use hamcrest::{assert_that,existing_file};
use support::{ResultTest, project, execs, main_file, escape_path};
use hamcrest::{assert_that, existing_file};
use cargo;
use cargo::util::{process,realpath};
use cargo::util::{process, realpath};

fn setup() {
}
Expand All @@ -31,12 +32,10 @@ test!(cargo_compile_simple {
.file("src/foo.rs", main_file(r#""i am foo""#, []).as_slice());

assert_that(p.cargo_process("cargo-build"), execs());
assert_that(&p.root().join("target/foo"), existing_file());

let target = p.root().join("target");
assert_that(&p.bin("foo"), existing_file());

assert_that(
process("foo").extra_path(target),
process(p.bin("foo")),
execs().with_stdout("i am foo\n"));
})

Expand Down Expand Up @@ -104,14 +103,15 @@ test!(cargo_compile_with_invalid_code {
execs()
.with_status(101)
.with_stderr(format!("\
src/foo.rs:1:1: 1:8 error: expected item but found `invalid`
src/foo.rs:1 invalid rust code!
{filename}:1:1: 1:8 error: expected item but found `invalid`
{filename}:1 invalid rust code!
^~~~~~~
Could not execute process \
`rustc src/foo.rs --crate-type bin --out-dir {} -L {} -L {}` (status=101)\n",
`rustc {filename} --crate-type bin --out-dir {} -L {} -L {}` (status=101)\n",
target.display(),
target.display(),
target.join("deps").display()).as_slice()));
target.join("deps").display(),
filename = format!("src{}foo.rs", path::SEP)).as_slice()));
})

test!(cargo_compile_with_warnings_in_the_root_package {
Expand All @@ -121,12 +121,12 @@ test!(cargo_compile_with_warnings_in_the_root_package {

assert_that(p.cargo_process("cargo-build"),
execs()
.with_stderr("\
src/foo.rs:1:14: 1:26 warning: code is never used: `dead`, #[warn(dead_code)] \
.with_stderr(format!("\
{filename}:1:14: 1:26 warning: code is never used: `dead`, #[warn(dead_code)] \
on by default
src/foo.rs:1 fn main() {} fn dead() {}
{filename}:1 fn main() {{}} fn dead() {{}}
^~~~~~~~~~~~
"));
", filename = format!("src{}foo.rs", path::SEP).as_slice())));
})

test!(cargo_compile_with_warnings_in_a_dep_package {
Expand All @@ -136,7 +136,7 @@ test!(cargo_compile_with_warnings_in_a_dep_package {
p = p
.file(".cargo/config", format!(r#"
paths = ["{}"]
"#, bar.display()).as_slice())
"#, escape_path(&bar)).as_slice())
.file("Cargo.toml", r#"
[project]
Expand Down Expand Up @@ -184,10 +184,10 @@ test!(cargo_compile_with_warnings_in_a_dep_package {
COMPILING, main.display()))
.with_stderr(""));

assert_that(&p.root().join("target/foo"), existing_file());
assert_that(&p.bin("foo"), existing_file());

assert_that(
cargo::util::process("foo").extra_path(p.root().join("target")),
cargo::util::process(p.bin("foo")),
execs().with_stdout("test passed\n"));
})

Expand All @@ -199,7 +199,7 @@ test!(cargo_compile_with_nested_deps_shorthand {
p = p
.file(".cargo/config", format!(r#"
paths = ["{}", "{}"]
"#, bar.display(), baz.display()).as_slice())
"#, escape_path(&bar), escape_path(&baz)).as_slice())
.file("Cargo.toml", r#"
[project]
Expand Down Expand Up @@ -260,10 +260,10 @@ test!(cargo_compile_with_nested_deps_shorthand {
.exec_with_output()
.assert();

assert_that(&p.root().join("target/foo"), existing_file());
assert_that(&p.bin("foo"), existing_file());

assert_that(
cargo::util::process("foo").extra_path(p.root().join("target")),
cargo::util::process(p.bin("foo")),
execs().with_stdout("test passed\n"));
})

Expand All @@ -275,7 +275,7 @@ test!(cargo_compile_with_nested_deps_longhand {
p = p
.file(".cargo/config", format!(r#"
paths = ["{}", "{}"]
"#, bar.display(), baz.display()).as_slice())
"#, escape_path(&bar), escape_path(&baz)).as_slice())
.file("Cargo.toml", r#"
[project]
Expand Down Expand Up @@ -334,10 +334,10 @@ test!(cargo_compile_with_nested_deps_longhand {

assert_that(p.cargo_process("cargo-build"), execs());

assert_that(&p.root().join("target/foo"), existing_file());
assert_that(&p.bin("foo"), existing_file());

assert_that(
cargo::util::process("foo").extra_path(p.root().join("target")),
cargo::util::process(p.bin("foo")),
execs().with_stdout("test passed\n"));
})

Expand Down Expand Up @@ -373,7 +373,7 @@ test!(custom_build {
build = "{}"
[[bin]] name = "foo"
"#, build.root().join("target/foo").display()))
"#, escape_path(&build.bin("foo"))))
.file("src/foo.rs", r#"
fn main() {}
"#);
Expand All @@ -394,7 +394,8 @@ test!(custom_build_failure {
version = "0.5.0"
authors = ["[email protected]"]
[[bin]] name = "foo"
[[bin]]
name = "foo"
"#)
.file("src/foo.rs", r#"
fn main() { fail!("nope") }
Expand All @@ -412,18 +413,19 @@ test!(custom_build_failure {
authors = ["[email protected]"]
build = "{}"
[[bin]] name = "foo"
"#, build.root().join("target/foo").display()))
[[bin]]
name = "foo"
"#, escape_path(&build.bin("foo"))))
.file("src/foo.rs", r#"
fn main() {}
"#);
assert_that(p.cargo_process("cargo-build"),
execs().with_status(101).with_stderr(format!("\
Could not execute process `{}` (status=101)
--- stderr
task '<main>' failed at 'nope', src/foo.rs:2
", build.root().join("target/foo").display())));
Could not execute process `{}` (status=101)\n\
--- stderr\n\
task '<main>' failed at 'nope', {filename}:2\n\
\n\
", build.bin("foo").display(), filename = format!("src{}foo.rs", path::SEP))));
})

test!(custom_build_env_vars {
Expand All @@ -437,7 +439,8 @@ test!(custom_build_env_vars {
version = "0.5.0"
authors = ["[email protected]"]
[[bin]] name = "foo"
[[bin]]
name = "foo"
"#)
.file("src/foo.rs", format!(r#"
use std::os;
Expand All @@ -446,8 +449,8 @@ test!(custom_build_env_vars {
assert_eq!(os::getenv("DEPS_DIR").unwrap(), "{}".to_str());
}}
"#,
p.root().join("target").display(),
p.root().join("target/deps").display()));
escape_path(&p.root().join("target")),
escape_path(&p.root().join("target").join("deps"))));
assert_that(build.cargo_process("cargo-build"), execs().with_status(0));


Expand All @@ -460,8 +463,9 @@ test!(custom_build_env_vars {
authors = ["[email protected]"]
build = "{}"
[[bin]] name = "foo"
"#, build.root().join("target/foo").display()))
[[bin]]
name = "foo"
"#, escape_path(&build.bin("foo"))))
.file("src/foo.rs", r#"
fn main() {}
"#);
Expand All @@ -480,7 +484,8 @@ test!(custom_build_in_dependency {
version = "0.5.0"
authors = ["[email protected]"]
[[bin]] name = "foo"
[[bin]]
name = "foo"
"#)
.file("src/foo.rs", format!(r#"
use std::os;
Expand All @@ -489,24 +494,26 @@ test!(custom_build_in_dependency {
assert_eq!(os::getenv("DEPS_DIR").unwrap(), "{}".to_str());
}}
"#,
p.root().join("target/deps").display(),
p.root().join("target/deps").display()));
escape_path(&p.root().join("target/deps")),
escape_path(&p.root().join("target/deps"))));
assert_that(build.cargo_process("cargo-build"), execs().with_status(0));


p = p
.file(".cargo/config", format!(r#"
paths = ["{}"]
"#, bar.display()).as_slice())
"#, escape_path(&bar)).as_slice())
.file("Cargo.toml", r#"
[project]
name = "foo"
version = "0.5.0"
authors = ["[email protected]"]
[[bin]] name = "foo"
[dependencies] bar = "0.5.0"
[[bin]]
name = "foo"
[dependencies]
bar = "0.5.0"
"#)
.file("src/foo.rs", r#"
extern crate bar;
Expand All @@ -520,8 +527,9 @@ test!(custom_build_in_dependency {
authors = ["[email protected]"]
build = "{}"
[[lib]] name = "bar"
"#, build.root().join("target/foo").display()))
[[lib]]
name = "bar"
"#, escape_path(&build.bin("foo"))))
.file("bar/src/bar.rs", r#"
pub fn bar() {}
"#);
Expand Down Expand Up @@ -554,7 +562,7 @@ test!(many_crate_types {
let mut files: Vec<String> = files.iter().filter_map(|f| {
match f.filename_str().unwrap() {
"deps" => None,
s if !s.starts_with("lib") => None,
s if s.contains("fingerprint") => None,
s => Some(s.to_str())
}
}).collect();
Expand Down
Loading

0 comments on commit b9ac9dd

Please sign in to comment.