Changeset 9583

Timestamp:

Feb 1, 2015, 10:34:30 PM (10 years ago)

Author:

steve

Message:

Fixing up test_all.py so it runs from anuga installed into source

Location:

trunk/anuga_core

Files:

• anuga/test_all.py (modified) (1 diff)
• test_all.py (modified) (2 diffs)

trunk/anuga_core/anuga/test_all.py

@@ -33 +33 @@
 
 # Directories that should not be searched for test files.
-exclude_dirs = ['shallow_water_balanced' , 'parallel', # Special requirements
+exclude_dirs = ['shallow_water_balanced' , # Special requirements
                 '.svn',          # subversion
                 'props', 'wcprops', 'prop-base', 'text-base', 'tmp']

trunk/anuga_core/test_all.py

@@ -1 @@
-from anuga.utilities.data_audit_wrapper import IP_verified
-from tempfile import mktemp
-
 import os
 
@@ -12 +9 @@
 print
 print '======================= anuga tests ================================='    
-print 'Changing to', os.getcwd() # This is now different from buildroot   
-execfile('test_all.py')
+print 'Changing to', os.getcwd() # This is now different from buildroot
 
+os.system('python test_all.py')
 
+os.chdir(buildroot)
 
-
-# Try to run parallel tests if pypar is installed
-from anuga import pypar_available
-   
-if pypar_available:
-    os.chdir(buildroot)
-    os.chdir('source')
-    os.chdir('anuga')
-    os.chdir('parallel')
-    os.chdir('tests')
-    print
-    print '===================== anuga parallel tests =========================='
-    print 'Changing to', os.getcwd()
-    execfile('test_all.py')
-else:
-    print 'anuga.parallel tests not run as pypar not installed'