Only catch exception in main() when told to.

smikes · Mar 23, 2013 · 34a744f · 34a744f
1 parent 46bd30d
commit 34a744f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/python/cxxtest/cxxtestgen.py b/python/cxxtest/cxxtestgen.py
@@ -45,7 +45,7 @@
 lastIncluded = ''
 
 
-def main(args=sys.argv):
+def main(args=sys.argv, catch=False):
     '''The main program'''
     #
     # Reset global state
@@ -69,7 +69,8 @@ def main(args=sys.argv):
             [options,suites] = cxxtest_parser.scanInputFiles( files, options )
         writeOutput()
     except SystemExit:
-        pass
+        if not catch:
+            raise
 
 def create_parser(asciidoc=False):
     parser = OptionParser("cxxtestgen [options] [<filename> ...]")

diff --git a/python/python3/cxxtest/cxxtestgen.py b/python/python3/cxxtest/cxxtestgen.py
@@ -45,7 +45,7 @@
 lastIncluded = ''
 
 
-def main(args=sys.argv):
+def main(args=sys.argv, catch=False):
     '''The main program'''
     #
     # Reset global state
@@ -69,7 +69,8 @@ def main(args=sys.argv):
             [options,suites] = cxxtest_parser.scanInputFiles( files, options )
         writeOutput()
     except SystemExit:
-        pass
+        if not catch:
+            raise
 
 def create_parser(asciidoc=False):
     parser = OptionParser("cxxtestgen [options] [<filename> ...]")