r8191 - /1.3/test_suite/system_tests/model_free.py -- December 11, 2008 - 17:24

Author: bugman
Date: Thu Dec 11 17:24:46 2008
New Revision: 8191

URL: http://svn.gna.org/viewcvs/relax?rev=8191&view=rev
Log:
Fixes for bug #12573 (https://gna.org/bugs/index.php?12573).

This bug was reported by Jack Howarth (https://gna.org/users/jhowarth).

The problem was simply that the optimisation checks are exact and had to be 
slightly modified for
the Darwin kernel on 32 bit PowerPC.


Modified:
    1.3/test_suite/system_tests/model_free.py

Modified: 1.3/test_suite/system_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/model_free.py?rev=8191&r1=8190&r2=8191&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/model_free.py (original)
+++ 1.3/test_suite/system_tests/model_free.py Thu Dec 11 17:24:46 2008
@@ -315,6 +315,10 @@
             iter = 156
             f_count = 701
             g_count = 163
+        elif SYSTEM == 'Darwin' and ARCH[0] == '32bit':
+            iter = 156
+            f_count = 695
+            g_count = 162
 
         # Test the values.
         self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
@@ -366,6 +370,9 @@
         if SYSTEM == 'Linux' and ARCH[0] == '64bit':
             f_count = 384
             g_count = 384
+        elif SYSTEM == 'Darwin' and ARCH[0] == '32bit':
+            f_count = 377
+            g_count = 377
 
         # Test the values.
         self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
@@ -466,6 +473,9 @@
         if SYSTEM == 'Linux' and ARCH[0] == '64bit':
             f_count = 757
             g_count = 757
+        elif SYSTEM == 'Darwin' and ARCH[0] == '32bit':
+            f_count = 757
+            g_count = 757
 
         # Test the values.
         self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
@@ -514,6 +524,10 @@
         h_count = 18
         warning = None
 
+        # Optimisation differences.
+        if SYSTEM == 'Darwin' and ARCH[0] == '32bit':
+            f_count = 94
+
         # Test the values.
         self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
         self.value_test(spin, select, s2, te, rex, chi2, iter, f_count, 
g_count, h_count, warning)
@@ -568,6 +582,9 @@
         elif SYSTEM == 'Windows' and ARCH[0] == '32bit':
             f_count = 165
             g_count = 165
+        elif SYSTEM == 'Darwin' and ARCH[0] == '32bit':
+            f_count = 160
+            g_count = 160
 
         # Test the values.
         self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)