New commandline args are clearer, and prepare for compression.

tests/bitmaps/TestBmpBlock.py

Index: tests/bitmaps/TestBmpBlock.py
diff --git a/tests/bitmaps/TestBmpBlock.py b/tests/bitmaps/TestBmpBlock.py
index 9abe72df63897d1ba8a5d222af5ad814c0dc893b..2f83e1ef680e79e79ff630e254650d49d341057c 100755
--- a/tests/bitmaps/TestBmpBlock.py
+++ b/tests/bitmaps/TestBmpBlock.py
@@ -21,17 +21,18 @@ class TestBmpBlock(unittest.TestCase):
     """Running with no args should print usage and fail."""
     rc, out, err = runprog(prog)
     self.assertNotEqual(0, rc)
-    self.assertTrue(out.count("Usage:"))
+    self.assertTrue(err.count("missing BMPBLOCK name"))
+    self.assertTrue(out.count("bmpblk_utility"))
 
   def testMissingBmp(self):
     """Missing a bmp specified in the yaml is an error."""
-    rc, out, err = runprog(prog, '-c', '-C', 'case_nobmp.yaml', 'FOO')
+    rc, out, err = runprog(prog, '-c', 'case_nobmp.yaml', 'FOO')
     self.assertNotEqual(0, rc)
     self.assertTrue(err.count("No such file or directory"))
 
   def testInvalidBmp(self):
     """A .bmp file that isn't really a BMP should fail."""
-    rc, out, err = runprog(prog, '-c', '-C', 'case_badbmp.yaml', 'FOO')
+    rc, out, err = runprog(prog, '-c', 'case_badbmp.yaml', 'FOO')
     self.assertNotEqual(0, rc)
     self.assertTrue(err.count("Unsupported image format"))