From c820329efd3f02ea416e2d073bf30d4f4b92b708 Mon Sep 17 00:00:00 2001 From: Chad Brewbaker Date: Sat, 6 Mar 2021 11:26:55 -0600 Subject: [PATCH] muted test not for windows and added windows temp file convention (#1748) * muted test not for windows and added windows temp file convention * Update mktemp.rs Revert windows mktmp template difference Co-authored-by: Chad Brewbaker --- src/uu/mktemp/src/mktemp.rs | 1 + tests/by-util/test_ls.rs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/uu/mktemp/src/mktemp.rs b/src/uu/mktemp/src/mktemp.rs index 8969dc51c..663f7d4ad 100644 --- a/src/uu/mktemp/src/mktemp.rs +++ b/src/uu/mktemp/src/mktemp.rs @@ -25,6 +25,7 @@ mod tempdir; static ABOUT: &str = "create a temporary file or directory."; static VERSION: &str = env!("CARGO_PKG_VERSION"); + static DEFAULT_TEMPLATE: &str = "tmp.XXXXXXXXXX"; static OPT_DIRECTORY: &str = "directory"; diff --git a/tests/by-util/test_ls.rs b/tests/by-util/test_ls.rs index 4dc4168de..422db8df9 100644 --- a/tests/by-util/test_ls.rs +++ b/tests/by-util/test_ls.rs @@ -285,7 +285,7 @@ fn test_ls_ls_color() { scene.ucmd().arg("--color=never").arg("z").succeeds(); } -#[cfg(not(target_os = "macos"))] // Truncate not available on mac +#[cfg(not(any(target_os = "macos", target_os = "windows")))] // Truncate not available on mac or win #[test] fn test_ls_human() { let scene = TestScenario::new(util_name!());