RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

tests: expand $OUT_DIR at compile time

Browse source
This commit is contained in:
knight42 2016-12-20 03:21:42 +08:00
parent 2660bb4fc3
commit fdbbb08aef
1 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/common/util.rs
View file

@ -374,15 +374,7 @@ 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!("OUT_DIR"), "..", "..", "..", 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),