[parted-devel] [PATCH] Fix two "make check"-as-root failures.

[Jim Meyering]

Filtered through "cat -A", so the ^M-infested lines are readable.

 tests/t1100-busy-label.sh |    2 +-$
 tests/test-lib.sh         |    2 +-$
 2 files changed, 2 insertions(+), 2 deletions(-)$
$
diff --git a/tests/t1100-busy-label.sh b/tests/t1100-busy-label.sh$
index d71da87..b8f5950 100755$
--- a/tests/t1100-busy-label.sh$
+++ b/tests/t1100-busy-label.sh$
@@ -76,7 +76,7 @@ test_expect_success 'create expected output file' 'test $fail = 0'$
 # Transform the actual output, removing ^M   ...^M.$
 test_expect_success \$
     'normalize the actual output' \$
-    'mv out o2 && sed -e "s,^M   *^M,,;s, $,," o2 \$
+    'mv out o2 && sed -e "s,^M   *^M,,;s, $,," \$
                       -e "s,^.*/lt-parted: ,parted: ," o2 > out'$
 $
 test_expect_success \$
diff --git a/tests/test-lib.sh b/tests/test-lib.sh$
index 29a2be1..9ce10e2 100644$
--- a/tests/test-lib.sh$
+++ b/tests/test-lib.sh$
@@ -205,7 +205,7 @@ emit_superuser_warning()$
 {$
   uid=`id -u` || uid=1$
   test "$uid" != 0 &&$
-    echo 'WARNING: You are not superuser.  Watch out for permissions.'$
+    echo 'WARNING: You are not superuser.  Watch out for permissions.' || :$
 }$
 $
 # Test the binaries we have just built.$