Index: /trunk/anuga_core/compile_all.py
===================================================================
--- /trunk/anuga_core/compile_all.py	(revision 8760)
+++ /trunk/anuga_core/compile_all.py	(revision 8761)
@@ -70,4 +70,63 @@
 os.chdir(buildroot)    
 
+try:
+    print '-----------------------------------------------'
+    print 'Attempting to compile Metis for parallel ANUGA!'
+    print '-----------------------------------------------'
+
+    # Attempt to compile Metis for use with anuga_parallel
+    os.chdir('source')
+    os.chdir('anuga_parallel')
+    os.chdir('pymetis')
+
+    make_logfile = os.path.join(buildroot, 'make_metis.log')
+    options = ''
+    if sys.platform == 'win32':
+        options = 'for_win32'
+    else:
+        if os.name == 'posix':
+            if os.uname()[4] in ['x86_64', 'ia64']:
+                options = ' '
+
+    make_command = 'make %s > %s' % (options, make_logfile)
+    print make_command
+    err = os.system(make_command)
+    if err != 0:
+        msg = 'Could not compile Metis '
+        msg += 'on platform %s, %s\n' % (sys.platform, os.name)
+        msg += 'You need to compile Metis manually '
+        msg += 'if you want to run ANUGA in parallel.'
+        raise Exception, msg
+    else:
+        msg = 'Compiled Metis succesfully. Output from Make is available in %s'\
+            % make_logfile
+        print msg
+
+    print 
+    print '-----------------------------------------------'
+    print 'Attempting to compile pypar_extras'
+    print '-----------------------------------------------'
+
+    os.chdir('..')
+    os.chdir('pypar_extras')
+
+    cmd = 'python anuga_setup.py'
+    print cmd
+    err = os.system(cmd)
+    if err != 0:
+        msg = 'Could not compile pypar_extras '
+        msg += 'on platform %s, %s\n' % (sys.platform, os.name)
+        msg += 'You need to compile pypar_extras manually '
+        msg += 'if you want to run ANUGA in parallel.'
+        raise Exception, msg
+    else:
+        msg = 'Compiled pypar_extras succesfully.'
+        print msg
+except:
+    print 'anuga_parallel code not compiled'
+
+
+
+
 
 
Index: unk/anuga_core/compile_parallel_all.py
===================================================================
--- /trunk/anuga_core/compile_parallel_all.py	(revision 8760)
+++ 	(revision )
@@ -1,71 +1,0 @@
-import os
-import time
-import sys
-import subprocess
-
-t0 = time.time()
-
-buildroot = os.getcwd()
-
-
-print '-----------------------------------------------'
-print 'Attempting to compile Metis for parallel ANUGA!'
-print '-----------------------------------------------'
-
-# Attempt to compile Metis for use with anuga_parallel
-os.chdir('source')
-os.chdir('anuga_parallel')
-os.chdir('pymetis')
-
-make_logfile = os.path.join(buildroot, 'make_metis.log')
-options = ''
-if sys.platform == 'win32':
-    options = 'for_win32'
-else:
-    if os.name == 'posix':
-        if os.uname()[4] in ['x86_64', 'ia64']:
-            options = ' '
-
-make_command = 'make %s > %s' % (options, make_logfile)
-print make_command
-err = os.system(make_command)
-if err != 0:
-    msg = 'Could not compile Metis '
-    msg += 'on platform %s, %s\n' % (sys.platform, os.name)
-    msg += 'You need to compile Metis manually '
-    msg += 'if you want to run ANUGA in parallel.'
-    raise Exception, msg
-else:
-    msg = 'Compiled Metis succesfully. Output from Make is available in %s'\
-        % make_logfile
-    print msg
-
-
-print '-----------------------------------------------'
-print 'Attempting to compile pypar_extras'
-print '-----------------------------------------------'
-
-os.chdir('..')
-os.chdir('pypar_extras')
-
-cmd = 'python anuga_setup.py'
-print cmd
-err = os.system(cmd)
-if err != 0:
-    msg = 'Could not compile pypar_extras '
-    msg += 'on platform %s, %s\n' % (sys.platform, os.name)
-    msg += 'You need to compile pypar_extras manually '
-    msg += 'if you want to run ANUGA in parallel.'
-    raise Exception, msg
-else:
-    msg = 'Compiled pypar_extras succesfully.'
-    print msg
-
-
-print        
-print 'That took %.3fs' %(time.time() - t0)
-
-
-
-if sys.platform == 'win32':
-    raw_input('Press the RETURN key')
Index: /trunk/anuga_core/test_all.py
===================================================================
--- /trunk/anuga_core/test_all.py	(revision 8760)
+++ /trunk/anuga_core/test_all.py	(revision 8761)
@@ -12,4 +12,21 @@
 print 'Changing to', os.getcwd() # This is now different from buildroot   
 execfile('test_all.py')
+
+
+# Try to run parallel tests if pypar installled
+
+try:
+    import pypar
+    os.chdir(buildroot)
+    os.chdir('source')
+    os.chdir('anuga_parallel')
+    print
+    print '===================== anuga_parallel tests =========================='
+    print 'Changing to', os.getcwd()
+    execfile('test_all.py')
+except:
+    print 'anuga_parallel tests not run'
+
+
 
 
Index: unk/anuga_core/test_parallel_all.py
===================================================================
--- /trunk/anuga_core/test_parallel_all.py	(revision 8760)
+++ 	(revision )
@@ -1,25 +1,0 @@
-from anuga.utilities.data_audit_wrapper import IP_verified
-from tempfile import mktemp
-
-import os
-
-buildroot = os.getcwd()
-
-
-os.chdir('source')
-os.chdir('anuga_parallel')
-print
-print '===================== anuga_parallel tests =========================='
-print 'Changing to', os.getcwd()
-execfile('test_all.py')
-
-
-# Temporary bail out
-import sys; sys.exit() 
-
-
-
-
-
-
-    
