Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-15 01:17:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Temporary fix for errors in testing

Browse source 
The errors were caused by the missing env $OUT_DIR which should be set by
cargo.

[Related issue](https://github.com/rust-lang/cargo/issues/3368).
This commit is contained in:
knight42 2016-12-08 12:26:08 +08:00
parent bb8e5b5824
commit a0ff0f623a
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.rs
View file

@ -4,6 +4,10 @@ use std::io::Write;
use std::path::Path; use std::path::Path;
pub fn main() { pub fn main() {
if let Ok(profile) = env::var("PROFILE") {
println!("cargo:rustc-cfg=build={:?}", profile);
}
let feature_prefix = "CARGO_FEATURE_"; let feature_prefix = "CARGO_FEATURE_";
let out_dir = env::var("OUT_DIR").unwrap(); let out_dir = env::var("OUT_DIR").unwrap();

10
tests/common/util.rs
View file

@ -374,7 +374,15 @@ impl TestScenario {
// Instead of hardcoding the path relative to the current // Instead of hardcoding the path relative to the current
// directory, use Cargo's OUT_DIR to find path to executable. // directory, use Cargo's OUT_DIR to find path to executable.
// This allows tests to be run using profiles other than debug. // This allows tests to be run using profiles other than debug.
let target_dir = path_concat!(env::var("OUT_DIR").unwrap(), "..", "..", "..", PROGNAME); // let target_dir = path_concat!(env::var("OUT_DIR").unwrap(), "..", "..", "..", PROGNAME);
let target_dir;
// FIXME: $OUT_DIR is not set by nightly cargo
// See also: https://github.com/rust-lang/cargo/issues/3368
if cfg!(build = "release") {
target_dir = path_concat!(env!("CARGO_MANIFEST_DIR"), "target", "release", PROGNAME);
} else {
target_dir = path_concat!(env!("CARGO_MANIFEST_DIR"), "target", "debug", PROGNAME);
}
PathBuf::from(AtPath::new(Path::new(&target_dir)).root_dir_resolved()) PathBuf::from(AtPath::new(Path::new(&target_dir)).root_dir_resolved())
}, },
util_name: String::from(util_name), util_name: String::from(util_name),