2 files changed, 17 insertions, 17 deletions
diff --git a/tests/base64.test b/tests/base64.test
index 2058198b..7e5a99a3 100755
--- a/tests/base64.test
+++ b/tests/base64.test
@@ -4,21 +4,21 @@
 
 #testing "name" "command" "result" "infile" "stdin"
 
-testing "simple" "base64" "c2ltcGxlCg==\n" "" "simple\n"
-testing "file" "base64 input" "c2ltcGxlCg==\n" "simple\n" ""
-testing "simple -d" "base64 -d" "simple\n" "" "c2ltcGxlCg==\n"
-testing "simple -d" "base64 -d input" "simple\n" "c2ltcGxlCg==" ""
-testing "default wrap" "base64" \
+testcmd "simple" "" "c2ltcGxlCg==\n" "" "simple\n"
+testcmd "file" "input" "c2ltcGxlCg==\n" "simple\n" ""
+testcmd "simple -d" "-d" "simple\n" "" "c2ltcGxlCg==\n"
+testcmd "simple -d" "-d input" "simple\n" "c2ltcGxlCg==" ""
+testcmd "default wrap" "" \
   "V2UndmUgcmVwbGFjZWQgdGhlIGRpbGl0aGl1bSB0aGV5IG5vcm1hbGx5IHVzZSB3aXRoIEZvbGdl\ncidzIENyeXN0YWxzLg==\n" \
   "" "We've replaced the dilithium they normally use with Folger's Crystals."
-testing "multiline -d " "base64 -d" \
+testcmd "multiline -d " "-d" \
  "We've replaced the dilithium they normally use with Folger's Crystals." "" \
   "V2UndmUgcmVwbGFjZWQgdGhlIGRpbGl0aGl1bSB0aGV5IG5vcm1hbGx5IHVzZSB3aXRoIEZvbGdl\ncidzIENyeXN0YWxzLg==\n"
 
-testing "-w" "base64 -w 10" \
+testcmd "-w" "-w 10" \
   "TWFyY2hpbm\ncgdG8gdGhl\nIGJlYXQgb2\nYgYSBkaWZm\nZXJlbnQga2\nV0dGxlIG9m\nIGZpc2guCg\n==\n" \
   "" "Marching to the beat of a different kettle of fish.\n"
 
-testing "-w0" "base64 -w0 input" \
+testcmd "-w0" "-w0 input" \
   "VmlraW5ncz8gVGhlcmUgYWluJ3Qgbm8gdmlraW5ncyBoZXJlLiBKdXN0IHVzIGhvbmVzdCBmYXJtZXJzLiBUaGUgdG93biB3YXMgYnVybmluZywgdGhlIHZpbGxhZ2VycyB3ZXJlIGRlYWQuIFRoZXkgZGlkbid0IG5lZWQgdGhvc2Ugc2hlZXAgYW55d2F5LiBUaGF0J3Mgb3VyIHN0b3J5IGFuZCB3ZSdyZSBzdGlja2luZyB0byBpdC4K" \
  "Vikings? There ain't no vikings here. Just us honest farmers. The town was burning, the villagers were dead. They didn't need those sheep anyway. That's our story and we're sticking to it.\n" ""
diff --git a/tests/basename.test b/tests/basename.test
index ab2cc20a..25e5493f 100755
--- a/tests/basename.test
+++ b/tests/basename.test
@@ -5,22 +5,22 @@
 #testing "name" "command" "result" "infile" "stdin"
 
 # Removal of extra /'s
-testing "/-only" "basename ///////" "/\n" "" ""
-testing "trailing /" "basename a//////" "a\n" "" ""
-testing "combined" "basename /////a///b///c///d/////" "d\n" "" ""
+testcmd "/-only" "///////" "/\n" "" ""
+testcmd "trailing /" "a//////" "a\n" "" ""
+testcmd "combined" "/////a///b///c///d/////" "d\n" "" ""
 
 # Standard suffix behavior.
-testing "suffix" "basename a/b/c/d.suffix .suffix" "d\n" "" ""
+testcmd "suffix" "a/b/c/d.suffix .suffix" "d\n" "" ""
 
 # A suffix cannot be the entire result.
-testing "suffix=result" "basename .txt .txt" ".txt\n" "" ""
+testcmd "suffix=result" ".txt .txt" ".txt\n" "" ""
 
 # Deal with suffix appearing in the filename
-testing "reappearing suffix 1" "basename a.txt.txt .txt" "a.txt\n" "" ""
-testing "reappearing suffix 2" "basename a.txt.old .txt" "a.txt.old\n" "" ""
+testcmd "reappearing suffix 1" "a.txt.txt .txt" "a.txt\n" "" ""
+testcmd "reappearing suffix 2" "a.txt.old .txt" "a.txt.old\n" "" ""
 
 # A suffix should be a real suffix, only a the end.
-testing "invalid suffix" "basename isthisasuffix? suffix" "isthisasuffix?\n" "" ""
+testcmd "invalid suffix" "isthisasuffix? suffix" "isthisasuffix?\n" "" ""
 
 # Zero-length suffix
-testing "zero-length suffix" "basename a/b/c ''" "c\n" "" ""
+testcmd "zero-length suffix" "a/b/c ''" "c\n" "" ""