gnome-python-desktop r509 - in trunk: . tests

[gjc svn gnome org]

Author: gjc
Date: Thu Dec 25 18:28:01 2008
New Revision: 509
URL: http://svn.gnome.org/viewvc/gnome-python-desktop?rev=509&view=rev

Log:
Don't use ltihooks in the WAF build system.  Closes #565598.

Modified:
   trunk/ChangeLog
   trunk/tests/common.py
   trunk/tests/runtests.py

Modified: trunk/tests/common.py
==============================================================================
--- trunk/tests/common.py	(original)
+++ trunk/tests/common.py	Thu Dec 25 18:28:01 2008
@@ -20,9 +20,10 @@
     ("evolution.ecal", "evolution"),
     ]
 
-def run_import_tests(builddir):
-    import ltihooks
-    ltihooks.install()
+def run_import_tests(builddir, no_import_hooks):
+    if not no_import_hooks:
+        import ltihooks
+        ltihooks.install()
 
     for item in modules:
         if isinstance(item, tuple):
@@ -42,4 +43,5 @@
         else:
             print "ok."
 
-    ltihooks.uninstall()
+    if not no_import_hooks:
+        ltihooks.uninstall()

Modified: trunk/tests/runtests.py
==============================================================================
--- trunk/tests/runtests.py	(original)
+++ trunk/tests/runtests.py	Thu Dec 25 18:28:01 2008
@@ -7,10 +7,12 @@
 
 if sys.argv > 1:
     builddir = sys.argv[1]
+    no_import_hooks = True
 else:
     builddir = '..'
+    no_import_hooks = False
 
-common.run_import_tests(builddir)
+common.run_import_tests(builddir, no_import_hooks)
 
 SKIP_FILES = ['common', 'runtests']