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: un-hardcode executable artifact

Browse source
This commit is contained in:
Joseph Crail 2016-05-22 15:09:04 -04:00
parent de7b6202a8
commit 6652e6b57d
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tests/common/util.rs
View file

@ -18,18 +18,19 @@ use std::time::Duration;
use tempdir::TempDir; use tempdir::TempDir;
#[cfg(windows)] #[cfg(windows)]
static PROGNAME: &'static str = "target\\debug\\uutils.exe"; static PROGNAME: &'static str = "uutils.exe";
#[cfg(windows)]
static FIXTURES_DIR: &'static str = "tests\\fixtures";
#[cfg(not(windows))] #[cfg(not(windows))]
static PROGNAME: &'static str = "target/debug/uutils"; static PROGNAME: &'static str = "uutils";
#[cfg(not(windows))]
static FIXTURES_DIR: &'static str = "tests/fixtures"; static TESTS_DIR: &'static str = "tests";
static FIXTURES_DIR: &'static str = "fixtures";
static ALREADY_RUN: &'static str = " you have already run this UCommand, if you want to run \ static ALREADY_RUN: &'static str = " you have already run this UCommand, if you want to run \
another command in the same test, use TestSet::new instead of \ another command in the same test, use TestSet::new instead of \
testing();"; testing();";
static MULTIPLE_STDIN_MEANINGLESS: &'static str = "Ucommand is designed around a typical use case of: provide args and input stream -> spawn process -> block until completion -> return output streams. For verifying that a particular section of the input stream is what causes a particular behavior, use the Command type directly."; static MULTIPLE_STDIN_MEANINGLESS: &'static str = "Ucommand is designed around a typical use case of: provide args and input stream -> spawn process -> block until completion -> return output streams. For verifying that a particular section of the input stream is what causes a particular behavior, use the Command type directly.";
pub fn repeat_str(s: &str, n: u32) -> String { pub fn repeat_str(s: &str, n: u32) -> String {
let mut repeated = String::new(); let mut repeated = String::new();
for _ in 0..n { for _ in 0..n {
@ -337,17 +338,20 @@ impl TestSet {
let tmpd = Rc::new(TempDir::new("uutils").unwrap()); let tmpd = Rc::new(TempDir::new("uutils").unwrap());
let ts = TestSet { let ts = TestSet {
bin_path: { bin_path: {
let mut bin_path_builder = env::current_dir().unwrap(); // Instead of hardcoding the path relative to the current
bin_path_builder.push(PathBuf::from(PROGNAME)); // directory, use Cargo's OUT_DIR to find path to executable.
bin_path_builder // This allows tests to be run using profiles other than debug.
let target_dir = path_concat!(env::var("OUT_DIR").unwrap(), "..", "..", "..");
Path::new(&target_dir).join(PROGNAME).canonicalize().unwrap()
}, },
util_name: String::from(util_name), util_name: String::from(util_name),
fixtures: AtPath::new(&tmpd.as_ref().path()), fixtures: AtPath::new(&tmpd.as_ref().path()),
tmpd: tmpd, tmpd: tmpd,
}; };
let mut fixture_path_builder = env::current_dir().unwrap(); let mut fixture_path_builder = env::current_dir().unwrap();
fixture_path_builder.push(PathBuf::from(FIXTURES_DIR)); fixture_path_builder.push(TESTS_DIR);
fixture_path_builder.push(PathBuf::from(util_name)); fixture_path_builder.push(FIXTURES_DIR);
fixture_path_builder.push(util_name);
match fs::metadata(&fixture_path_builder) { match fs::metadata(&fixture_path_builder) {
Ok(m) => if m.is_dir() { Ok(m) => if m.is_dir() {
recursive_copy(&fixture_path_builder, &ts.fixtures.subdir).unwrap(); recursive_copy(&fixture_path_builder, &ts.fixtures.subdir).unwrap();