[Boost-commit] svn:boost r48682 - in trunk: libs/math/test status

Subject: [Boost-commit] svn:boost r48682 - in trunk: libs/math/test status
From: john_at_[hidden]
Date: 2008-09-09 08:10:12

Author: johnmaddock
Date: 2008-09-09 08:10:11 EDT (Tue, 09 Sep 2008)
New Revision: 48682
URL: http://svn.boost.org/trac/boost/changeset/48682

Log:
Split files into smaller tests.
Fixes #2307.
Text files modified: 
   trunk/libs/math/test/Jamfile.v2            |    65 ++++++++++++++++++++++++++++++++++++++- 
   trunk/libs/math/test/test_ibeta.cpp        |     8 ++++                                    
   trunk/libs/math/test/test_ibeta_inv.cpp    |     8 ++++                                    
   trunk/libs/math/test/test_ibeta_inv_ab.cpp |     9 +++++                                   
   trunk/status/explicit-failures-markup.xml  |     8 ----                                    
   5 files changed, 87 insertions(+), 11 deletions(-)

Modified: trunk/libs/math/test/Jamfile.v2
==============================================================================
--- trunk/libs/math/test/Jamfile.v2	(original)
+++ trunk/libs/math/test/Jamfile.v2	2008-09-09 08:10:11 EDT (Tue, 09 Sep 2008)
@@ -162,7 +162,29 @@
         : # input files
         : # requirements
               <define>TEST_REAL_CONCEPT
-        : test_ibeta_real_concept ;
+	      <define>TEST_DATA=1
+        : test_ibeta_real_concept1 ;
+run test_ibeta.cpp  
+        : # command line
+        : # input files
+        : # requirements
+	      <define>TEST_REAL_CONCEPT
+	      <define>TEST_DATA=2
+        : test_ibeta_real_concept2 ;
+run test_ibeta.cpp  
+        : # command line
+        : # input files
+        : # requirements
+	      <define>TEST_REAL_CONCEPT
+	      <define>TEST_DATA=3
+        : test_ibeta_real_concept3 ;
+run test_ibeta.cpp  
+        : # command line
+        : # input files
+        : # requirements
+	      <define>TEST_REAL_CONCEPT
+	      <define>TEST_DATA=4
+        : test_ibeta_real_concept4 ;
 run test_ibeta_inv.cpp  
         : # command line
         : # input files
@@ -186,7 +208,29 @@
         : # input files
         : # requirements
               <define>TEST_REAL_CONCEPT
-        : test_ibeta_inv_real_concept ;
+	      <define>TEST_DATA=1
+        : test_ibeta_inv_real_concept1 ;
+run test_ibeta_inv.cpp  
+        : # command line
+        : # input files
+        : # requirements
+	      <define>TEST_REAL_CONCEPT
+	      <define>TEST_DATA=2
+        : test_ibeta_inv_real_concept2 ;
+run test_ibeta_inv.cpp  
+        : # command line
+        : # input files
+        : # requirements
+	      <define>TEST_REAL_CONCEPT
+	      <define>TEST_DATA=3
+        : test_ibeta_inv_real_concept3 ;
+run test_ibeta_inv.cpp  
+        : # command line
+        : # input files
+        : # requirements
+	      <define>TEST_REAL_CONCEPT
+	      <define>TEST_DATA=4
+        : test_ibeta_inv_real_concept4 ;
 run test_ibeta_inv_ab.cpp  
         : # command line
         : # input files
@@ -210,7 +254,22 @@
         : # input files
         : # requirements
               <define>TEST_REAL_CONCEPT
-        : test_ibeta_inv_ab_real_concept ;
+	      <define>TEST_DATA=1
+        : test_ibeta_inv_ab_real_concept1 ;
+run test_ibeta_inv_ab.cpp  
+        : # command line
+        : # input files
+        : # requirements
+	      <define>TEST_REAL_CONCEPT
+	      <define>TEST_DATA=2
+        : test_ibeta_inv_ab_real_concept2 ;
+run test_ibeta_inv_ab.cpp  
+        : # command line
+        : # input files
+        : # requirements
+	      <define>TEST_REAL_CONCEPT
+	      <define>TEST_DATA=3
+        : test_ibeta_inv_ab_real_concept3 ;
 run test_igamma.cpp ;
 run test_igamma_inv.cpp  
         : # command line

Modified: trunk/libs/math/test/test_ibeta.cpp
==============================================================================
--- trunk/libs/math/test/test_ibeta.cpp	(original)
+++ trunk/libs/math/test/test_ibeta.cpp	2008-09-09 08:10:11 EDT (Tue, 09 Sep 2008)
@@ -363,21 +363,29 @@
    // The contents are as follows, each row of data contains
    // five items, input value a, input value b, integration limits x, beta(a, b, x) and ibeta(a, b, x):
    //
+#if !defined(TEST_DATA) || (TEST_DATA == 1)
 #  include "ibeta_small_data.ipp"
 
    do_test_beta(ibeta_small_data, name, "Incomplete Beta Function: Small Values");
+#endif
 
+#if !defined(TEST_DATA) || (TEST_DATA == 2)
 #  include "ibeta_data.ipp"
 
    do_test_beta(ibeta_data, name, "Incomplete Beta Function: Medium Values");
 
+#endif
+#if !defined(TEST_DATA) || (TEST_DATA == 3)
 #  include "ibeta_large_data.ipp"
 
    do_test_beta(ibeta_large_data, name, "Incomplete Beta Function: Large and Diverse Values");
+#endif
 
+#if !defined(TEST_DATA) || (TEST_DATA == 4)
 #  include "ibeta_int_data.ipp"
 
    do_test_beta(ibeta_int_data, name, "Incomplete Beta Function: Small Integer Values");
+#endif
 }
 
 template <class T>

Modified: trunk/libs/math/test/test_ibeta_inv.cpp
==============================================================================
--- trunk/libs/math/test/test_ibeta_inv.cpp	(original)
+++ trunk/libs/math/test/test_ibeta_inv.cpp	2008-09-09 08:10:11 EDT (Tue, 09 Sep 2008)
@@ -278,21 +278,29 @@
    // The contents are as follows, each row of data contains
    // five items, input value a, input value b, integration limits x, beta(a, b, x) and ibeta(a, b, x):
    //
+#if !defined(TEST_DATA) || (TEST_DATA == 1)
 #  include "ibeta_small_data.ipp"
 
    test_inverses(ibeta_small_data);
+#endif
 
+#if !defined(TEST_DATA) || (TEST_DATA == 2)
 #  include "ibeta_data.ipp"
 
    test_inverses(ibeta_data);
+#endif
 
+#if !defined(TEST_DATA) || (TEST_DATA == 3)
 #  include "ibeta_large_data.ipp"
 
    test_inverses(ibeta_large_data);
+#endif
 
+#if !defined(TEST_DATA) || (TEST_DATA == 4)
 #  include "ibeta_inv_data.ipp"
 
    test_inverses2(ibeta_inv_data, name, "Inverse incomplete beta");
+#endif
 }
 
 template <class T>

Modified: trunk/libs/math/test/test_ibeta_inv_ab.cpp
==============================================================================
--- trunk/libs/math/test/test_ibeta_inv_ab.cpp	(original)
+++ trunk/libs/math/test/test_ibeta_inv_ab.cpp	2008-09-09 08:10:11 EDT (Tue, 09 Sep 2008)
@@ -254,17 +254,25 @@
    //
    std::cout << "Running sanity checks for type " << name << std::endl;
 
+#if !defined(TEST_DATA) || (TEST_DATA == 1)
 #  include "ibeta_small_data.ipp"
 
    test_inverses(ibeta_small_data);
+#endif
 
+#if !defined(TEST_DATA) || (TEST_DATA == 2)
 #  include "ibeta_data.ipp"
 
    test_inverses(ibeta_data);
+#endif
 
+#if !defined(TEST_DATA) || (TEST_DATA == 3)
 #  include "ibeta_large_data.ipp"
 
    test_inverses(ibeta_large_data);
+#endif
+
+#if !defined(TEST_REAL_CONCEPT) || defined(FULL_TEST)
 #ifndef FULL_TEST
    if(boost::is_floating_point<T>::value){
 #endif
@@ -280,6 +288,7 @@
 #ifndef FULL_TEST
    }
 #endif
+#endif
 }
 
 int test_main(int, char* [])

Modified: trunk/status/explicit-failures-markup.xml
==============================================================================
--- trunk/status/explicit-failures-markup.xml	(original)
+++ trunk/status/explicit-failures-markup.xml	2008-09-09 08:10:11 EDT (Tue, 09 Sep 2008)
@@ -3414,14 +3414,6 @@
             </note>
         </mark-expected-failures>
        <mark-expected-failures>
-          <test name="test_binomial_real_concept"/>
-          <toolset name="gcc-3.4.6_linux_x86_64"/>
-          <toolset name="gcc-4.2.1_linux_x86_64"/>
-          <note author="John Maddock">
-             This test takes too long to execute and times out on this platform.
-          </note>
-       </mark-expected-failures>
-       <mark-expected-failures>
           <test name="test_remez"/>
           <toolset name="hp_cxx-71_006_tru64"/>
           <note author="John Maddock">