Merge pull request #2449 from miDeb/temp-win

Make tests pass on a windows VM

src/uu/mkdir/src/mkdir.rs

@@ -40,7 +40,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
             Arg::with_name(OPT_MODE)
                 .short("m")
                 .long(OPT_MODE)
-                .help("set file mode")
+                .help("set file mode (not implemented on windows)")
                 .default_value("755"),
         )
         .arg(

src/uu/mktemp/src/mktemp.rs

@@ -77,14 +77,14 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
                 .long(OPT_TMPDIR)
                 .help(
                     "interpret TEMPLATE relative to DIR; if DIR is not specified, use \
-                     $TMPDIR if set, else /tmp. With this option, TEMPLATE must not \
+                     $TMPDIR ($TMP on windows) if set, else /tmp. With this option, TEMPLATE must not \
                      be an absolute name; unlike with -t, TEMPLATE may contain \
                      slashes, but mktemp creates only the final component",
                 )
                 .value_name("DIR"),
         )
         .arg(Arg::with_name(OPT_T).short(OPT_T).help(
-            "Generate a template (using the supplied prefix and TMPDIR if set) \
+            "Generate a template (using the supplied prefix and TMPDIR (TMP on windows) if set) \
              to create a filename template [deprecated]",
         ))
         .arg(

tests/by-util/test_mktemp.rs

@@ -17,7 +17,10 @@ static TEST_TEMPLATE8: &str = "tempXXXl/ate";
 #[cfg(windows)]
 static TEST_TEMPLATE8: &str = "tempXXXl\\ate";
 
+#[cfg(not(windows))]
 const TMPDIR: &str = "TMPDIR";
+#[cfg(windows)]
+const TMPDIR: &str = "TMP";
 
 #[test]
 fn test_mktemp_mktemp() {
@@ -386,7 +389,7 @@ fn test_mktemp_tmpdir_one_arg() {
     let scene = TestScenario::new(util_name!());
 
     let result = scene
-        .ucmd()
+        .ucmd_keepenv()
         .arg("--tmpdir")
         .arg("apt-key-gpghome.XXXXXXXXXX")
         .succeeds();
@@ -399,7 +402,7 @@ fn test_mktemp_directory_tmpdir() {
     let scene = TestScenario::new(util_name!());
 
     let result = scene
-        .ucmd()
+        .ucmd_keepenv()
         .arg("--directory")
         .arg("--tmpdir")
         .arg("apt-key-gpghome.XXXXXXXXXX")

tests/by-util/test_mv.rs

@@ -729,6 +729,7 @@ fn test_mv_verbose() {
 }
 
 #[test]
+#[cfg(target_os = "linux")] // mkdir does not support -m on windows. Freebsd doesn't return a permission error either.
 fn test_mv_permission_error() {
     let scene = TestScenario::new("mkdir");
     let folder1 = "bar";
@@ -738,12 +739,11 @@ fn test_mv_permission_error() {
     scene.ucmd().arg("-m777").arg(folder2).succeeds();
 
     scene
-        .cmd_keepenv(util_name!())
+        .ccmd("mv")
         .arg(folder2)
         .arg(folder_to_move)
-        .run()
+        .fails()
-        .stderr_str()
+        .stderr_contains("Permission denied");
-        .ends_with("Permission denied");
 }
 
 // Todo:

tests/by-util/test_sort.rs

@@ -28,7 +28,8 @@ fn test_helper(file_name: &str, possible_args: &[&str]) {
 fn test_buffer_sizes() {
     let buffer_sizes = ["0", "50K", "50k", "1M", "100M"];
     for buffer_size in &buffer_sizes {
-        new_ucmd!()
+        TestScenario::new(util_name!())
+            .ucmd_keepenv()
             .arg("-n")
             .arg("-S")
             .arg(buffer_size)
@@ -40,7 +41,8 @@ fn test_buffer_sizes() {
         {
             let buffer_sizes = ["1000G", "10T"];
             for buffer_size in &buffer_sizes {
-                new_ucmd!()
+                TestScenario::new(util_name!())
+                    .ucmd_keepenv()
                     .arg("-n")
                     .arg("-S")
                     .arg(buffer_size)
@@ -877,7 +879,8 @@ fn test_compress() {
 
 #[test]
 fn test_compress_fail() {
-    new_ucmd!()
+    TestScenario::new(util_name!())
+        .ucmd_keepenv()
         .args(&[
             "ext_sort.txt",
             "-n",
@@ -892,7 +895,8 @@ fn test_compress_fail() {
 
 #[test]
 fn test_merge_batches() {
-    new_ucmd!()
+    TestScenario::new(util_name!())
+        .ucmd_keepenv()
         .args(&["ext_sort.txt", "-n", "-S", "150b"])
         .succeeds()
         .stdout_only_fixture("ext_sort.expected");
@@ -900,7 +904,8 @@ fn test_merge_batches() {
 
 #[test]
 fn test_merge_batch_size() {
-    new_ucmd!()
+    TestScenario::new(util_name!())
+        .ucmd_keepenv()
         .arg("--batch-size=2")
         .arg("-m")
         .arg("--unique")