Render PDF documentation with rst2pdf

[software/mutest.git] / mutest

diff --git a/mutest b/mutest
index 68d6acc3cdd9c37de34d374701c712f8b5a561b2..ce26b475a982d70b5d52c3cbd17aa9778ee7ef34 100755 (executable)
--- a/mutest
+++ b/mutest
@@ -102,7 +102,7 @@ class TestSuiteInfo (object):
        cases_re = re.compile(r'[0-9a-f]{8} T (mu_test\w*)', re.I)
 
        def __init__(self, so_name):
        cases_re = re.compile(r'[0-9a-f]{8} T (mu_test\w*)', re.I)
 
        def __init__(self, so_name):

-               proc = Popen(['nm', '-p', so_name], stdout=PIPE)
+               proc = Popen(['nm', so_name], stdout=PIPE)

                output = proc.communicate()[0]
                self.inits = self.inits_re.findall(output)
                self.terms = self.terms_re.findall(output)
                output = proc.communicate()[0]
                self.inits = self.inits_re.findall(output)
                self.terms = self.terms_re.findall(output)


@@ -151,7 +151,7 @@ class TestSuite (object):
                        if res:
                                log(V_ERROR, "%s:%s: initialization function "
                                                "failed (returned %d), "
                        if res:
                                log(V_ERROR, "%s:%s: initialization function "
                                                "failed (returned %d), "

-                                               "skipping test suite...\n",
+                                               "skipping test suite...",

                                                self.name, name, res);
                                r.result = R_SKIPPED
                                return r
                                                self.name, name, res);
                                r.result = R_SKIPPED
                                return r


@@ -188,11 +188,11 @@ def parse_arguments(args):
        search_help = ('Search for all test suites in the current directory '
                        '(*.so) and add them')
        parser = OptionParser()
        search_help = ('Search for all test suites in the current directory '
                        '(*.so) and add them')
        parser = OptionParser()

-       parser.add_option('-v', dest='verbose_level', action='count',
-                       default=1, help=verbose_help)
-       parser.add_option('-q', '--verbose-level', dest='quiet',
-                       action='store_true', default=False, help=quiet_help)
-       parser.add_option('-a', '--search-all', dest='search_all',
+       parser.add_option('-v', '--verbose', dest='verbose_level',
+                       action='count', default=1, help=verbose_help)
+       parser.add_option('-q', '--quiet', dest='quiet', action='store_true',
+                       default=False, help=quiet_help)
+       parser.add_option('-s', '--search', dest='search',

                        action='store_true', default=False, help=search_help)
        return parser.parse_args()
 
                        action='store_true', default=False, help=search_help)
        return parser.parse_args()
 


@@ -207,7 +207,7 @@ def main(args):
        else:
                verbose_level = opts.verbose_level
 
        else:
                verbose_level = opts.verbose_level
 

-       if opts.search_all:
+       if opts.search:

                args.extend(glob('*.so'))
 
        if not args:
                args.extend(glob('*.so'))
 
        if not args: