Index: trunk/psLib/test/math/tap_psPolynomialEval1D.c
===================================================================
--- trunk/psLib/test/math/tap_psPolynomialEval1D.c	(revision 11374)
+++ trunk/psLib/test/math/tap_psPolynomialEval1D.c	(revision 11397)
@@ -4,6 +4,6 @@
 *  ORD and CHEB type polynomials.
 *
-*  @version  $Revision: 1.3 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2007-01-29 21:32:50 $
+*  @version  $Revision: 1.4 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2007-01-30 00:11:31 $
 *
 *  XXX: Probably should test single- and multi-dimensional polynomials in
@@ -73,7 +73,6 @@
         }
         ok(!errorFlag, "psPolynomial1DEval() successful (Ordinary)");
-
+        skip_end();
         psFree(polyOrd);
-        skip_end();
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -85,6 +84,5 @@
         psPolynomial1D*  polyCheb = psPolynomial1DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1);
         ok(polyCheb != NULL, "Chebyshev psPolynomial1D successfully allocated");
-        skip_start(polyCheb == NULL, 2, "Skipping tests because psPolynomial1DAlloc() failed");
-
+        skip_start(polyCheb == NULL, 1, "Skipping tests because psPolynomial1DAlloc() failed");
         // Set polynomial members
         for(psS32 i = 0; i < TERMS; i++)
@@ -103,6 +101,6 @@
         }
         ok(!errorFlag, "psPolynomial1DEval() successful (Chebyshev)");
+        skip_end();
         psFree(polyCheb);
-        skip_end();
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -127,8 +125,15 @@
     {
         psMemId id = psMemGetId();
+        // Create input vectors
+        psVector* inputOrd = psVectorAlloc(TESTPOINTS, PS_TYPE_F64);
+        for(psS32 i = 0; i < TESTPOINTS; i++)
+        {
+            inputOrd->data.F64[i] = poly1DXValue[i];
+            inputOrd->n++;
+        }
+
         psPolynomial1D* polyOrd = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, TERMS-1);
         ok(polyOrd != NULL, "Ordinary polynomial allocation successful");
         skip_start(polyOrd == NULL, 6, "Skipping tests because psPolynomial1DAlloc() failed");
-
         // Set polynomial members
         for(psS32 i = 0; i < TERMS; i++)
@@ -136,12 +141,4 @@
             polyOrd->coeff[i] = poly1DCoeff[i];
             polyOrd->mask[i]  = poly1DMask[i];
-        }
-
-        // Create input vectors
-        psVector* inputOrd = psVectorAlloc(TESTPOINTS, PS_TYPE_F64);
-        for(psS32 i = 0; i < TESTPOINTS; i++)
-        {
-            inputOrd->data.F64[i] = poly1DXValue[i];
-            inputOrd->n++;
         }
 
@@ -172,10 +169,8 @@
         inputOrd->type.type = PS_TYPE_U8;
         ok(psPolynomial1DEvalVector(polyOrd,inputOrd) == NULL, "psPolynomial1DEvalVector() produced NULL when called with non F64 input vector");
-
+        psFree(outputOrd);
+        skip_end();
         psFree(inputOrd);
-        psFree(outputOrd);
         psFree(polyOrd);
-
-        skip_end();
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -184,8 +179,15 @@
     {
         psMemId id = psMemGetId();
+        // Create input vectors
+        psVector* inputCheb = psVectorAlloc(TESTPOINTS, PS_TYPE_F64);
+        for(psS32 i = 0; i < TESTPOINTS; i++)
+        {
+            inputCheb->data.F64[i] = poly1DXChebValue[i];
+            inputCheb->n++;
+        }
+
         psPolynomial1D* polyCheb = psPolynomial1DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1);
         ok(polyCheb != NULL, "Ordinary polynomial allocation successful");
-        skip_start(polyCheb == NULL, 6, "Skipping tests because psPolynomial1DAlloc() failed");
-
+        skip_start(polyCheb == NULL, 5, "Skipping tests because psPolynomial1DAlloc() failed");
         // Set polynomial members
         for(psS32 i = 0; i < TERMS; i++)
@@ -193,12 +195,4 @@
             polyCheb->coeff[i] = 1.0;
             polyCheb->mask[i]  = poly1DMask[i];
-        }
-
-        // Create input vectors
-        psVector* inputCheb = psVectorAlloc(TESTPOINTS, PS_TYPE_F64);
-        for(psS32 i = 0; i < TESTPOINTS; i++)
-        {
-            inputCheb->data.F64[i] = poly1DXChebValue[i];
-            inputCheb->n++;
         }
 
@@ -226,9 +220,8 @@
         inputCheb->type.type = PS_TYPE_U8;
         ok(psPolynomial1DEvalVector(polyCheb,inputCheb) == NULL, "psPolynomial1DEvalVector() produced NULL when called with non F64 input vector");
-
+        psFree(outputCheb);
+        skip_end();
         psFree(inputCheb);
-        psFree(outputCheb);
         psFree(polyCheb);
-        skip_end();
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
