Merge pull request #2 from uutils/master

catchup with uutils main

tests/by-util/test_sort.rs

@@ -127,11 +127,7 @@ fn test_months_whitespace() {
 
 #[test]
 fn test_version_empty_lines() {
-    new_ucmd!()
-        .arg("-V")
-        .arg("version-empty-lines.txt")
-        .succeeds()
-        .stdout_is("\n\n\n\n\n\n\n1.2.3-alpha\n1.2.3-alpha2\n\t\t\t1.12.4\n11.2.3\n");
+    test_helper("version-empty-lines", &["-V", "--version-sort"]);
 }
 
 #[test]
@@ -941,3 +937,17 @@ fn test_sigpipe_panic() {
         Ok(String::new())
     );
 }
+
+#[test]
+fn test_conflict_check_out() {
+    let check_flags = ["-c=silent", "-c=quiet", "-c=diagnose-first", "-c", "-C"];
+    for check_flag in &check_flags {
+        new_ucmd!()
+            .arg(check_flag)
+            .arg("-o=/dev/null")
+            .fails()
+            .stderr_contains(
+                "error: The argument '--output <FILENAME>' cannot be used with '--check",
+            );
+    }
+}

tests/fixtures/sort/version-empty-lines.expected

@@ -8,4 +8,8 @@
 1.2.3-alpha
 1.2.3-alpha2
 11.2.3
+bar2
+bar2.0.0
+foo0.1
+foo1.0
 			1.12.4

tests/fixtures/sort/version-empty-lines.expected.debug

@@ -0,0 +1,45 @@
+
+^ no match for key
+^ no match for key
+
+^ no match for key
+^ no match for key
+
+^ no match for key
+^ no match for key
+
+^ no match for key
+^ no match for key
+
+^ no match for key
+^ no match for key
+
+^ no match for key
+^ no match for key
+
+^ no match for key
+^ no match for key
+1.2.3-alpha
+___________
+___________
+1.2.3-alpha2
+____________
+____________
+11.2.3
+______
+______
+bar2
+____
+____
+bar2.0.0
+________
+________
+foo0.1
+______
+______
+foo1.0
+______
+______
+>>>1.12.4
+_________
+_________

tests/fixtures/sort/version-empty-lines.txt

@@ -9,3 +9,7 @@
 
 
 			1.12.4
+foo1.0
+foo0.1
+bar2.0.0
+bar2