Call dbus_bus_register

[platform/core/uifw/at-spi2-atk.git] / tests / testrunner.py

diff --git a/tests/testrunner.py b/tests/testrunner.py
old mode 100644 (file)
new mode 100755 (executable)
index 5684c75..feafc33
--- a/tests/testrunner.py
+++ b/tests/testrunner.py
@@ -1,17 +1,10 @@
+#!/usr/bin/python
+
 import sys
+import os
 import unittest
 import clients
 
-from optparse import OptionParser
-
-parser = OptionParser()
-parser.add_option("-d", "--testdata", dest="testdata", help="Location of test data directory")
-parser.add_option("-a", "--atspilib", dest="atspilib", help="Location of atk to atspi adaptor")
-parser.add_option("-t", "--testmodules", dest="testmodules", help="Location of test application libraries")
-parser.add_option("-r", "--testapp", dest="testapp", help="Location of test application executable")
-parser.add_option("-b", "--busname", dest="busname", help="D-Bus name of test application")
-parser.add_option("-o", "--objectpath", dest="objectpath", help="Object path of test applicaiton tree interface")
-
 optionvars = ["testdata",
                "atspilib",
                "testmodules",
@@ -19,18 +12,23 @@ optionvars = ["testdata",
                "busname",
                "objectpath"]
 
-def set_data(options, name):
-       val = getattr(options, name)
-       if val is not None:
-               setattr(clients.testutil, name, val)
 
 def main(argv):
-       (options, args) = parser.parse_args()
-       [set_data(options, name) for name in optionvars]
+       def set_data(name):
+               if name in os.environ.keys():
+                       setattr(clients.testutil, name, os.environ[name])
+
+       [set_data(name) for name in optionvars]
 
        runner = unittest.TextTestRunner()
        testsuite = unittest.defaultTestLoader.loadTestsFromModule(clients)
-       runner.run(testsuite)
+       result = runner.run(testsuite)
+
+       if result.wasSuccessful():
+               return 0
+       else:
+               return 1
+
 
 if __name__=="__main__":
        sys.exit(main(sys.argv))