Index: /branches/eam_branch_20080430/psLib/test/imageops/tap_psImageMap.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/imageops/tap_psImageMap.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/imageops/tap_psImageMap.c (revision 17502) @@ -197,5 +197,5 @@ // XXX this function needs to correct for the mean superpixel position // which is sampled... - psImageMapGenerate (map, x, y, f, 0.1); + psImageMapGenerate (map, x, y, f, NULL, 0.1); psFree (binning); Index: /branches/eam_branch_20080430/psLib/test/imageops/tap_psImageMapFit2.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/imageops/tap_psImageMapFit2.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/imageops/tap_psImageMapFit2.c (revision 17502) @@ -141,5 +141,5 @@ // XXX this function needs to correct for the mean superpixel position // which is sampled... - psImageMapFit (map, x, y, f, NULL); + psImageMapFit (map, NULL, 0, x, y, f, NULL); psFree (binning); Index: /branches/eam_branch_20080430/psLib/test/math/tap_psPolyFit4D.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/math/tap_psPolyFit4D.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/math/tap_psPolyFit4D.c (revision 17502) @@ -166,5 +166,5 @@ for (int iz = 0; iz < polyOrderZ + 1; iz++) { for (int it = 0; it < polyOrderT + 1; it++) { - myPoly->mask[ix][iy][iz][it] = 0xff; // Mask it out + myPoly->coeffMask[ix][iy][iz][it] = 0xff; // Mask it out } } @@ -173,10 +173,10 @@ // Put these back in - myPoly->mask[0][0][0][0] = 0; // A - myPoly->mask[1][0][0][0] = 0; // B * x - myPoly->mask[0][1][0][0] = 0; // C * y - myPoly->mask[0][0][1][0] = 0; // D * z - myPoly->mask[0][0][0][1] = 0; // E * t - myPoly->mask[1][1][0][0] = 0; // F * xy + myPoly->coeffMask[0][0][0][0] = 0; // A + myPoly->coeffMask[1][0][0][0] = 0; // B * x + myPoly->coeffMask[0][1][0][0] = 0; // C * y + myPoly->coeffMask[0][0][1][0] = 0; // D * z + myPoly->coeffMask[0][0][0][1] = 0; // E * t + myPoly->coeffMask[1][1][0][0] = 0; // F * xy #endif Index: /branches/eam_branch_20080430/psLib/test/math/tap_psPolynomial.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/math/tap_psPolynomial.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/math/tap_psPolynomial.c (revision 17502) @@ -16,6 +16,6 @@ * XXX: Compare to FLT_EPSILON * -* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-05-08 06:35:16 $ +* @version $Revision: 1.4.16.1 $ $Name: not supported by cvs2svn $ +* @date $Date: 2008-05-04 23:37:01 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -61,6 +61,6 @@ errorFlag = true; } - if (my1DPoly->mask[i] != 0) { - diag("Mask[%d] %d not as expected %d", i, my1DPoly->mask[i], 0); + if (my1DPoly->coeffMask[i] != 0) { + diag("Mask[%d] %d not as expected %d", i, my1DPoly->coeffMask[i], 0); errorFlag = true; } @@ -135,6 +135,6 @@ errorFlag = true; } - if (my2DPoly->mask[i][j] != 0) { - diag("Mask[%d][%d] %d not as expected %d", i, j, my2DPoly->mask[i][j], 0); + if (my2DPoly->coeffMask[i][j] != 0) { + diag("Mask[%d][%d] %d not as expected %d", i, j, my2DPoly->coeffMask[i][j], 0); errorFlag = true; } @@ -214,7 +214,7 @@ errorFlag = true; } - if (my3DPoly->mask[i][j][k] != 0) { + if (my3DPoly->coeffMask[i][j][k] != 0) { diag("Mask[%d][%d][%d] %d not as expected %d", - i, j, k, my3DPoly->mask[i][j][k], 0); + i, j, k, my3DPoly->coeffMask[i][j][k], 0); errorFlag = true; } @@ -301,7 +301,7 @@ errorFlag = true; } - if (my4DPoly->mask[i][j][k][l] != 0) { + if (my4DPoly->coeffMask[i][j][k][l] != 0) { diag("Mask[%d][%d][%d][%d] %d not as expected %d", - i, j, k, l, my4DPoly->mask[i][j][k][l], 0); + i, j, k, l, my4DPoly->coeffMask[i][j][k][l], 0); errorFlag = true; } Index: /branches/eam_branch_20080430/psLib/test/math/tap_psPolynomialEval1D.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/math/tap_psPolynomialEval1D.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/math/tap_psPolynomialEval1D.c (revision 17502) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-05-08 06:36:51 $ +* @version $Revision: 1.9.16.1 $ $Name: not supported by cvs2svn $ +* @date $Date: 2008-05-04 23:37:01 $ * * XXX: Probably should test single- and multi-dimensional polynomials in @@ -68,5 +68,5 @@ for(psS32 i = 0; i < TERMS; i++) { polyOrd->coeff[i] = poly1DCoeff[i]; - polyOrd->mask[i] = poly1DMask[i]; + polyOrd->coeffMask[i] = poly1DMask[i]; } @@ -97,5 +97,5 @@ { polyCheb->coeff[i] = 1.0; - polyCheb->mask[i] = poly1DMask[i]; + polyCheb->coeffMask[i] = poly1DMask[i]; } // Evaluate test points and verify results @@ -133,5 +133,5 @@ { polyOrd->coeff[i] = poly1DCoeff[i]; - polyOrd->mask[i] = poly1DMask[i]; + polyOrd->coeffMask[i] = poly1DMask[i]; } @@ -199,5 +199,5 @@ { polyCheb->coeff[i] = 1.0; - polyCheb->mask[i] = poly1DMask[i]; + polyCheb->coeffMask[i] = poly1DMask[i]; } Index: /branches/eam_branch_20080430/psLib/test/math/tap_psPolynomialEval2D.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/math/tap_psPolynomialEval2D.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/math/tap_psPolynomialEval2D.c (revision 17502) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-05-08 06:36:51 $ +* @version $Revision: 1.7.16.1 $ $Name: not supported by cvs2svn $ +* @date $Date: 2008-05-04 23:37:01 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -96,5 +96,5 @@ for(psS32 j = 0; j < TERMS; j++) { polyOrd->coeff[i][j] = poly2DCoeff[i][j]; - polyOrd->mask[i][j] = poly2DMask[i][j]; + polyOrd->coeffMask[i][j] = poly2DMask[i][j]; } } @@ -131,5 +131,5 @@ for(psS32 j = 0; j < TERMS; j++) { polyCheb->coeff[i][j] = 1.0; - polyCheb->mask[i][j] = poly2DMask[i][j]; + polyCheb->coeffMask[i][j] = poly2DMask[i][j]; } } @@ -174,5 +174,5 @@ for(psS32 j = 0; j < TERMS; j++) { polyOrd->coeff[i][j] = poly2DCoeff[i][j]; - polyOrd->mask[i][j] = poly2DMask[i][j]; + polyOrd->coeffMask[i][j] = poly2DMask[i][j]; } } @@ -268,5 +268,5 @@ for(psS32 j = 0; j < TERMS; j++) { polyCheb->coeff[i][j] = 1.0; - polyCheb->mask[i][j] = poly2DMask[i][j]; + polyCheb->coeffMask[i][j] = poly2DMask[i][j]; } } Index: /branches/eam_branch_20080430/psLib/test/math/tap_psPolynomialEval3D.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/math/tap_psPolynomialEval3D.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/math/tap_psPolynomialEval3D.c (revision 17502) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-05-08 06:36:51 $ +* @version $Revision: 1.8.16.1 $ $Name: not supported by cvs2svn $ +* @date $Date: 2008-05-04 23:37:01 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -149,5 +149,5 @@ for(psS32 k = 0; k < TERMS; k++) { polyOrd->coeff[i][j][k] = Dpoly3DCoeff[i][j][k]; - polyOrd->mask[i][j][k] = poly3DMask[i][j][k]; + polyOrd->coeffMask[i][j][k] = poly3DMask[i][j][k]; } } @@ -188,5 +188,5 @@ for(psS32 k = 0; k < TERMS; k++) { polyCheb->coeff[i][j][k] = 1.0; - polyCheb->mask[i][j][k] = poly3DMask[i][j][k]; + polyCheb->coeffMask[i][j][k] = poly3DMask[i][j][k]; } } @@ -239,5 +239,5 @@ for(psS32 k = 0; k < TERMS; k++) { polyOrd->coeff[i][j][k] = Dpoly3DCoeff[i][j][k]; - polyOrd->mask[i][j][k] = poly3DMask[i][j][k]; + polyOrd->coeffMask[i][j][k] = poly3DMask[i][j][k]; } } @@ -355,5 +355,5 @@ for(psS32 k = 0; k < TERMS; k++) { polyCheb->coeff[i][j][k] = 1.0; - polyCheb->mask[i][j][k] = poly3DMask[i][j][k]; + polyCheb->coeffMask[i][j][k] = poly3DMask[i][j][k]; } } Index: /branches/eam_branch_20080430/psLib/test/math/tap_psPolynomialEval4D.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/math/tap_psPolynomialEval4D.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/math/tap_psPolynomialEval4D.c (revision 17502) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-05-08 06:36:51 $ +* @version $Revision: 1.6.16.1 $ $Name: not supported by cvs2svn $ +* @date $Date: 2008-05-04 23:37:01 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -389,5 +389,5 @@ for(psS32 l = 0; l < TERMS; l++) { polyOrd->coeff[i][j][k][l] = Dpoly4DCoeff[i][j][k][l]; - polyOrd->mask[i][j][k][l] = poly4DMask[i][j][k][l]; + polyOrd->coeffMask[i][j][k][l] = poly4DMask[i][j][k][l]; } } @@ -428,5 +428,5 @@ for(psS32 l = 0; l < TERMS; l++) { polyCheb->coeff[i][j][k][l] = 1.0; - polyCheb->mask[i][j][k][l] = poly4DMask[i][j][k][l]; + polyCheb->coeffMask[i][j][k][l] = poly4DMask[i][j][k][l]; } } @@ -485,5 +485,5 @@ for(psS32 l = 0; l < TERMS; l++) { polyOrd->coeff[i][j][k][l] = Dpoly4DCoeff[i][j][k][l]; - polyOrd->mask[i][j][k][l] = poly4DMask[i][j][k][l]; + polyOrd->coeffMask[i][j][k][l] = poly4DMask[i][j][k][l]; } } @@ -629,5 +629,5 @@ for(psS32 l = 0; l < TERMS; l++) { polyCheb->coeff[i][j][k][l] = 1.0; - polyCheb->mask[i][j][k][l] = poly4DMask[i][j][k][l]; + polyCheb->coeffMask[i][j][k][l] = poly4DMask[i][j][k][l]; } } Index: /branches/eam_branch_20080430/psLib/test/math/tap_psPolynomialUtils_Derivatives.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/math/tap_psPolynomialUtils_Derivatives.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/math/tap_psPolynomialUtils_Derivatives.c (revision 17502) @@ -33,7 +33,7 @@ // mask remaining elements - poly->mask[2][1] = 1; - poly->mask[1][2] = 1; - poly->mask[2][2] = 1; + poly->coeffMask[2][1] = 1; + poly->coeffMask[1][2] = 1; + poly->coeffMask[2][2] = 1; psPolynomial2D *dX = psPolynomial2D_dX (NULL, poly); @@ -46,10 +46,10 @@ is_float(dX->coeff[0][1], +4.0, "x^0 y^1 coeff is %f", dX->coeff[0][1]); - ok(!dX->mask[0][0], "x^0 y^0 coeff is unmasked"); - ok(!dX->mask[1][0], "x^1 y^0 coeff is unmasked"); - ok(!dX->mask[0][1], "x^0 y^1 coeff is unmasked"); - - ok(dX->mask[1][1], "x^1 y^1 coeff is masked"); - ok(dX->mask[1][2], "x^1 y^2 coeff is masked"); + ok(!dX->coeffMask[0][0], "x^0 y^0 coeff is unmasked"); + ok(!dX->coeffMask[1][0], "x^1 y^0 coeff is unmasked"); + ok(!dX->coeffMask[0][1], "x^0 y^1 coeff is unmasked"); + + ok(dX->coeffMask[1][1], "x^1 y^1 coeff is masked"); + ok(dX->coeffMask[1][2], "x^1 y^2 coeff is masked"); psFree (dX); @@ -81,7 +81,7 @@ // mask remaining elements - poly->mask[2][1] = 1; - poly->mask[1][2] = 1; - poly->mask[2][2] = 1; + poly->coeffMask[2][1] = 1; + poly->coeffMask[1][2] = 1; + poly->coeffMask[2][2] = 1; psPolynomial2D *dX = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); @@ -95,10 +95,10 @@ is_float(dX->coeff[0][1], +4.0, "x^0 y^1 coeff is %f", dX->coeff[0][1]); - ok(!dX->mask[0][0], "x^0 y^0 coeff is unmasked"); - ok(!dX->mask[1][0], "x^1 y^0 coeff is unmasked"); - ok(!dX->mask[0][1], "x^0 y^1 coeff is unmasked"); - - ok(dX->mask[1][1], "x^1 y^1 coeff is masked"); - ok(dX->mask[1][2], "x^1 y^2 coeff is masked"); + ok(!dX->coeffMask[0][0], "x^0 y^0 coeff is unmasked"); + ok(!dX->coeffMask[1][0], "x^1 y^0 coeff is unmasked"); + ok(!dX->coeffMask[0][1], "x^0 y^1 coeff is unmasked"); + + ok(dX->coeffMask[1][1], "x^1 y^1 coeff is masked"); + ok(dX->coeffMask[1][2], "x^1 y^2 coeff is masked"); psFree (dX); @@ -130,7 +130,7 @@ // mask remaining elements - poly->mask[2][1] = 1; - poly->mask[1][2] = 1; - poly->mask[2][2] = 1; + poly->coeffMask[2][1] = 1; + poly->coeffMask[1][2] = 1; + poly->coeffMask[2][2] = 1; psPolynomial2D *result = psPolynomial2D_dX (poly, poly); @@ -163,7 +163,7 @@ // mask remaining elements - poly->mask[2][1] = 1; - poly->mask[1][2] = 1; - poly->mask[2][2] = 1; + poly->coeffMask[2][1] = 1; + poly->coeffMask[1][2] = 1; + poly->coeffMask[2][2] = 1; psPolynomial2D *dY = psPolynomial2D_dY (NULL, poly); @@ -176,10 +176,10 @@ is_float(dY->coeff[0][1], -4.0, "x^0 y^1 coeff is %f", dY->coeff[0][1]); - ok(!dY->mask[0][0], "x^0 y^0 coeff is unmasked"); - ok(!dY->mask[1][0], "x^1 y^0 coeff is unmasked"); - ok(!dY->mask[0][1], "x^0 y^1 coeff is unmasked"); - - ok(dY->mask[1][1], "x^1 y^1 coeff is masked"); - ok(dY->mask[1][2], "x^1 y^2 coeff is masked"); + ok(!dY->coeffMask[0][0], "x^0 y^0 coeff is unmasked"); + ok(!dY->coeffMask[1][0], "x^1 y^0 coeff is unmasked"); + ok(!dY->coeffMask[0][1], "x^0 y^1 coeff is unmasked"); + + ok(dY->coeffMask[1][1], "x^1 y^1 coeff is masked"); + ok(dY->coeffMask[1][2], "x^1 y^2 coeff is masked"); psFree (dY); @@ -211,7 +211,7 @@ // mask remaining elements - poly->mask[2][1] = 1; - poly->mask[1][2] = 1; - poly->mask[2][2] = 1; + poly->coeffMask[2][1] = 1; + poly->coeffMask[1][2] = 1; + poly->coeffMask[2][2] = 1; psPolynomial2D *dY = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); @@ -225,10 +225,10 @@ is_float(dY->coeff[0][1], -4.0, "x^0 y^1 coeff is %f", dY->coeff[0][1]); - ok(!dY->mask[0][0], "x^0 y^0 coeff is unmasked"); - ok(!dY->mask[1][0], "x^1 y^0 coeff is unmasked"); - ok(!dY->mask[0][1], "x^0 y^1 coeff is unmasked"); - - ok(dY->mask[1][1], "x^1 y^1 coeff is masked"); - ok(dY->mask[1][2], "x^1 y^2 coeff is masked"); + ok(!dY->coeffMask[0][0], "x^0 y^0 coeff is unmasked"); + ok(!dY->coeffMask[1][0], "x^1 y^0 coeff is unmasked"); + ok(!dY->coeffMask[0][1], "x^0 y^1 coeff is unmasked"); + + ok(dY->coeffMask[1][1], "x^1 y^1 coeff is masked"); + ok(dY->coeffMask[1][2], "x^1 y^2 coeff is masked"); psFree (dY); @@ -260,7 +260,7 @@ // mask remaining elements - poly->mask[2][1] = 1; - poly->mask[1][2] = 1; - poly->mask[2][2] = 1; + poly->coeffMask[2][1] = 1; + poly->coeffMask[1][2] = 1; + poly->coeffMask[2][2] = 1; psPolynomial2D *result = psPolynomial2D_dY (poly, poly); Index: /branches/eam_branch_20080430/psLib/test/mathtypes/tap_psImage.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/mathtypes/tap_psImage.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/mathtypes/tap_psImage.c (revision 17502) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-04-26 22:18:39 $ + * @version $Revision: 1.7.18.1 $ $Name: not supported by cvs2svn $ + * @date $Date: 2008-05-04 23:37:01 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -17,5 +17,4 @@ #include #include "pslib.h" -#include "psType.h" #include "tap.h" #include "pstap.h" @@ -170,6 +169,6 @@ // children is freed. image = psImageAlloc(100,100,PS_TYPE_F32); - psImageSubset(image,(psRegion) {50,0,70,20}); - psImageSubset(image,(psRegion) {70,20,90,40}); + psImageSubset(image,((psRegion) {50,0,70,20})); + psImageSubset(image,((psRegion) {70,20,90,40})); psFree(image); ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks"); Index: /branches/eam_branch_20080430/psLib/test/sys/tap_psError.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/sys/tap_psError.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/sys/tap_psError.c (revision 17502) @@ -5,6 +5,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-05-01 00:08:52 $ + * @version $Revision: 1.6.18.1 $ $Name: not supported by cvs2svn $ + * @date $Date: 2008-05-04 23:37:01 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -19,4 +19,9 @@ #include "pstap.h" +// XXX in this file, several operations are only validated by printing an output to the screen. +// we should define an output file and compare the contents of the output file to expectations. +// I've commented out these features for now + +# if (0) // Function used in testError02 to verify the psErrorStackPrintV function static void myErrorStackPrint( @@ -32,5 +37,5 @@ va_end(ap); } - +# endif psS32 main( psS32 argc, char* argv[] ) @@ -83,5 +88,5 @@ psErrorCode code=PS_ERR_BAD_PARAMETER_VALUE; ok(psError(code, true, "Error code = %d", code) == code, "Failed return value verify."); - psErrorStackPrint(stderr,"ERROR STACK PRINT Test1A"); + // psErrorStackPrint(stderr,"ERROR STACK PRINT Test1A"); ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks"); } @@ -94,5 +99,5 @@ ok(psError(code+1, true, "Error code = %d", code+1) == code+1, "Failed return with empty string."); - psErrorStackPrint(stderr,"ERROR STACK PRINT Test1B"); + // psErrorStackPrint(stderr,"ERROR STACK PRINT Test1B"); ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks"); } @@ -104,5 +109,5 @@ ok(psError(-1, true, "Error code = %d", -1) == -1, "Failed return with undefined code."); - psErrorStackPrint(stderr,"ERROR STACK PRINT Test1D"); + // psErrorStackPrint(stderr,"ERROR STACK PRINT Test1D"); ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks"); } @@ -115,5 +120,5 @@ ok(psError(code, false, "Error code = %d", code) == code, "Failed return with false new arg."); - psErrorStackPrint(stderr,"ERROR STACK PRINT Test1E"); + // psErrorStackPrint(stderr,"ERROR STACK PRINT Test1E"); ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks"); } @@ -124,5 +129,5 @@ psMemId id = psMemGetId(); ok(psError(9, true, "Errno code = %d", 9) == 9, "Error Code" ); - psErrorStackPrint(stderr,"ERROR STACK PRINT Test1F"); + // psErrorStackPrint(stderr,"ERROR STACK PRINT Test1F"); ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks"); } @@ -138,5 +143,5 @@ ok(psError(code, true, "Error code = %d", code) == code, "Failed return value verify."); - myErrorStackPrint(stderr,"ERROR STACK PRINT Test%dA",2); + // myErrorStackPrint(stderr,"ERROR STACK PRINT Test%dA",2); ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks"); } Index: /branches/eam_branch_20080430/psLib/test/sys/tap_psString.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/sys/tap_psString.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/sys/tap_psString.c (revision 17502) @@ -20,6 +20,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-06-13 23:32:11 $ + * @version $Revision: 1.10.16.1 $ $Name: not supported by cvs2svn $ + * @date $Date: 2008-05-04 23:37:01 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -38,5 +38,5 @@ psLogSetFormat("HLNM"); psLogSetLevel(PS_LOG_INFO); - plan_tests(68); + plan_tests(65); @@ -455,7 +455,8 @@ psFree(str); - char charStr[10]; - ok(!psMemCheckType(PS_DATA_STRING, charStr), - "Input string is a psDataType"); + // XXX EAM this function raises an abort since we are trying to test a non-psLib memory block + // char charStr[10]; + // ok(!psMemCheckType(PS_DATA_STRING, charStr), "Input string is a psDataType"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } Index: /branches/eam_branch_20080430/psLib/test/sys/tap_psTrace.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/sys/tap_psTrace.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/sys/tap_psTrace.c (revision 17502) @@ -19,9 +19,17 @@ plan_tests(54); +# define DEBUG 1 +# if (DEBUG) + FILE *output = fopen ("/dev/null", "w"); + int outFD = fileno (output); +# else + int outFD = 2; +# endif + // testTrace00() { psMemId id = psMemGetId(); psS32 lev = 0; - (void)psTraceSetDestination(2); + (void)psTraceSetDestination(outFD); for (int i=0;i<10;i++) { (void)psTraceSetLevel(".", i); @@ -58,5 +66,5 @@ { psMemId id = psMemGetId(); - (void)psTraceSetDestination(2); + (void)psTraceSetDestination(outFD); (void)psTraceSetLevel(".A.B.C.D.E", 5); psTrace(".A.C.D.C",1,"You should not see this"); @@ -72,5 +80,5 @@ psMemId id = psMemGetId(); psTraceReset(); - (void)psTraceSetDestination(2); + (void)psTraceSetDestination(outFD); (void)psTraceSetLevel(".A.B", 2); (void)psTraceSetLevel(".A.B.C.D.E", 5); @@ -97,5 +105,5 @@ { psMemId id = psMemGetId(); - (void)psTraceSetDestination(2); + (void)psTraceSetDestination(outFD); for (int i=0;i<10;i++) { @@ -134,9 +142,9 @@ for (int nb = 0 ; nb<4;nb++) { if (nb == 0) - (void)psTraceSetDestination(1); + (void)psTraceSetDestination(((outFD == 2) ? 1 : outFD)); if (nb == 1) - (void)psTraceSetDestination(2); + (void)psTraceSetDestination(((outFD == 2) ? 2 : outFD)); if (nb == 2) - (void)psTraceSetDestination(0); + (void)psTraceSetDestination(((outFD == 2) ? 0 : outFD)); if (nb == 3) (void)psTraceSetDestination(FD); @@ -174,5 +182,5 @@ { psMemId id = psMemGetId(); - (void)psTraceSetDestination(2); + (void)psTraceSetDestination(outFD); (void)psTraceSetLevel(".", 9); (void)psTraceSetLevel(".a", 8); @@ -213,5 +221,5 @@ { psMemId id = psMemGetId(); - (void)psTraceSetDestination(2); + (void)psTraceSetDestination(outFD); (void)psTraceSetLevel(".", 9); (void)psTraceSetLevel(".a", 8); @@ -287,3 +295,8 @@ ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks"); } + +# if (DEBUG) + close (outFD); +# endif + } Index: /branches/eam_branch_20080430/psLib/test/types/tap_psArguments_all.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/types/tap_psArguments_all.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/types/tap_psArguments_all.c (revision 17502) @@ -15,15 +15,19 @@ #include "pstap.h" +// tests which send output to the screen are silent unless DEBUG = 1 +#define DEBUG 0 + int main(void) { psLogSetFormat("HLNM"); psLogSetLevel(PS_LOG_INFO); - plan_tests(28); - - // testArgumentGetParse() + plan_tests(30); + + // test the failure cases for psArgumentGet, psArgumentRemove { psMemId id = psMemGetId(); - psMetadata *arg = NULL; - char *argv[25]; + + // define a simple fake argument list : this is not modified + char *argv[5]; argv[0] = "./program"; argv[1] = "-string"; @@ -31,28 +35,7 @@ argv[3] = "-float"; argv[4] = "6.66"; - argv[5] = "-double"; - argv[6] = "0.666"; - argv[7] = "-int"; - argv[8] = "8"; - argv[9] = "-int"; - argv[10] = "16"; - argv[11] = "-int"; - argv[12] = "32"; - argv[13] = "-int"; - argv[14] = "64"; - argv[15] = "-U8"; - argv[16] = "1"; - argv[17] = "-U16"; - argv[18] = "666"; - argv[19] = "-U32"; - argv[20] = "666"; - argv[21] = "-Bool"; - argv[22] = "true"; - argv[23] = "-int"; - // argv[24] = "32"; - argv[24] = "-vvv"; - int argc = 25; - - //Try to get an argument's position + int argc = 5; + + // Try to get an argument's position int i = psArgumentGet(argc, argv, "-float"); { @@ -61,5 +44,5 @@ } - //Return 0 for attempting to get from a NULL input argument. + // Return 0 for attempting to get from a NULL input argument. { ok( psArgumentGet(argc, NULL, "-float") == 0, @@ -67,5 +50,5 @@ } - //Return 0 for attempting to find a NULL string + // Return 0 for attempting to find a NULL string { ok( psArgumentGet(argc, argv, NULL) == 0, @@ -73,5 +56,5 @@ } - //Return 0 for attempting to find an empty string + // Return 0 for attempting to find an empty string { ok( psArgumentGet(argc, argv, "") == 0, @@ -79,5 +62,5 @@ } - //Return 0 for attempting to get an argument that doesn't match + // Return 0 for attempting to get an argument that doesn't match { ok( psArgumentGet(argc, argv, "-xxx") == 0, @@ -85,5 +68,5 @@ } - //Return false for attempting to remove argnum = 0 + // Return false for attempting to remove argnum = 0 { ok( !psArgumentRemove(0, &argc, argv), @@ -91,5 +74,5 @@ } - //Return false for attempting to remove NULL argc + // Return false for attempting to remove NULL argc { ok( !psArgumentRemove(0, NULL, argv), @@ -97,39 +80,12 @@ } - //Setup the argument list for comparison + // simple argument definitions for comparison psMetadata *args = psMetadataAlloc(); psMetadataAdd(args, PS_LIST_TAIL, "-string", PS_DATA_STRING, "Test String", "SomeString"); psMetadataAdd(args, PS_LIST_TAIL, "-float", PS_DATA_F32, "Test Float", 0.666); psMetadataAdd(args, PS_LIST_TAIL, "-double", PS_DATA_F64, "Test Double", 0.666); - psMetadata *ints = psMetadataAlloc(); - psMetadataAdd(ints, PS_LIST_TAIL, "int1", PS_DATA_S8, "Int1", 8); - psMetadataAdd(ints, PS_LIST_TAIL, "int2", PS_DATA_S16, "Int2", 16); - psMetadataAdd(ints, PS_LIST_TAIL, "int3", PS_DATA_S32, "Int3", 32); - psMetadataAdd(ints, PS_LIST_TAIL, "int4", PS_DATA_S64, "Int4", 64); - psMetadataAdd(args, PS_LIST_TAIL, "-int", PS_DATA_METADATA, "Integers", ints); - psFree(ints); // Drop reference - psMetadataAddS32(args, PS_LIST_TAIL, "-multi", 0, "666", 2); - psMetadataAddS32(args, PS_LIST_TAIL, "-multi", PS_META_DUPLICATE_OK, "hello kitty", 1); - - psMetadataAddU8(args, PS_LIST_TAIL, "-U8", 0, "U8", 1); - psMetadataAddU16(args, PS_LIST_TAIL, "-U16", 0, "U16", 666); - psMetadataAddU32(args, PS_LIST_TAIL, "-U32", 0, "U32", 666); - psMetadataAddU64(args, PS_LIST_TAIL, "-U64", 0, "U64", 666); - psMetadataAddBool(args, PS_LIST_TAIL, "-Bool", 0, "boolean", true); - psMetadataAddBool(args, PS_LIST_TAIL, "-Bool2", 0, "boolean", false); - psSphere *sphere = psSphereAlloc(); - sphere->r = 6.66; - sphere->d = 666.666; - psMetadataAddPtr(args, PS_LIST_TAIL, "ptr", PS_DATA_SPHERE, "", sphere); - psFree(sphere); - - //psArgumentHelp test - //Do nothing for NULL input (exit gracefully) - psArgumentHelp(NULL); - //Print the Argument help for valid metadata - psArgumentHelp(args); - - //psArgumentParse tests - //Return false for NULL input arguments + + // psArgumentParse tests + // Return false for NULL input arguments { ok( !psArgumentParse(NULL, &argc, argv), @@ -137,5 +93,5 @@ } - //Return false for NULL input argc + // Return false for NULL input argc { ok( !psArgumentParse(args, NULL, argv), @@ -143,5 +99,5 @@ } - //Return false for NULL input argv + // Return false for NULL input argv { ok( !psArgumentParse(args, &argc, NULL), @@ -149,5 +105,5 @@ } - //Return false for argc = 0 + // Return false for argc = 0 { int tempc = 0; @@ -156,60 +112,22 @@ } - //Return false for string not found in metadata arguments - { - ok( !psArgumentParse(args, &argc, argv), + // Return false for string not found in metadata arguments + { + // define a simple fake argument list : this is not modified + char *argvBad[5]; + argvBad[0] = "./program"; + argvBad[1] = "-string"; + argvBad[2] = "new"; + argvBad[3] = "-test"; + argvBad[4] = "6.66"; + int argcBad = 5; + + ok( !psArgumentParse(args, &argcBad, argvBad), "psArgumentParse: return false for argv containing unspecified input."); } - //Return true for valid case - { - psArgumentRemove(25, &argc, argv); - ok( psArgumentParse(args, &argc, argv), - "psArgumentParse: return true for valid inputs."); - } - - //Return false for inconsistent argc in metadata - { - psMetadata *tempArg = psMetadataAlloc(); - psMetadata *mdtemp = psMetadataAlloc(); - psMetadataAdd(mdtemp, PS_LIST_TAIL, "int1", PS_DATA_S8, "Int1", 8); - psMetadataAdd(mdtemp, PS_LIST_TAIL, "int2", PS_DATA_S16, "Int2", 16); - psMetadataAdd(mdtemp, PS_LIST_TAIL, "int3", PS_DATA_S32, "Int3", 32); - psMetadataAdd(tempArg, PS_LIST_TAIL, "-int", PS_DATA_METADATA, "Integers", mdtemp); - psFree(mdtemp); - int argcc = 2; - char *argvv[2]; - argvv[0] = "./program"; - argvv[1] = "-string"; - ok( !psArgumentParse(tempArg, &argcc, argvv), - "psArgumentParse: return false for inconsistent argc."); - psFree(tempArg); - } - - //Return false for argc = 1 - { - int argcc = 2; - char *argvv[2]; - argvv[0] = "./program"; - argvv[1] = "-string"; - ok( !psArgumentParse(args, &argcc, argvv), - "psArgumentParse: return false for incomplete string syntax."); - } - - //Return true for an unfound MULTI match - { - int argcc = 3; - char *argvv[3]; - argvv[0] = "./program"; - argvv[1] = "-multi"; - argvv[2] = "2"; - ok( psArgumentParse(args, &argcc, argvv), - "psArgumentParse: return true for MULTI."); - } - - //Check for Memory leaks + // Check for Memory leaks { psFree(args); - psFree(arg); checkMem(); } @@ -217,107 +135,242 @@ } - - // testArgumentVerbosity() + // define a valid argument input set and definition set + // Return true for valid case { psMemId id = psMemGetId(); - //Return 2 (default) for NULL input argument - { - int argc = 1; - ok( psArgumentVerbosity(&argc, NULL) == 2, - "psArgumentVerbosity: return 2 for NULL argument input."); - } - - //Return 2 for NULL argc input - { - char *argv[1]; - argv[0] = "./program"; - ok( psArgumentVerbosity(NULL, argv) == 2, - "psArgumentVerbosity: return 2 for NULL argument input."); - } - - //Return 3 for "-v" option - { - int argc = 2; - char *argv[2]; - argv[0] = "./program"; - argv[1] = "-v"; - ok( psArgumentVerbosity(&argc, argv) == 3, - "psArgumentVerbosity: return 3 for '-v' argument input."); - } - - //Return 4 for "-vv" option - { - int argc = 2; - char *argv[2]; - argv[0] = "./program"; - argv[1] = "-vv"; - ok( psArgumentVerbosity(&argc, argv) == 4, - "psArgumentVerbosity: return 4 for '-vv' argument input."); - } - - //Return 5 for "-vvv" option - { - int argc = 2; - char *argv[2]; - argv[0] = "./program"; - argv[1] = "-vvv"; - ok( psArgumentVerbosity(&argc, argv) == 5, - "psArgumentVerbosity: return 5 for '-vvv' argument input."); - } - - //These routines should return 5 since that was the last level set above with -vvv - //Return 5 for "-logfmt" option - { - int argc = 2; - char *argv[2]; - argv[0] = "./program"; - argv[1] = "-logfmt"; - int rc = psArgumentVerbosity(&argc, argv); - ok(rc == 5, "psArgumentVerbosity: return 5 for '-logfmt' argument input (was %d)", rc); - } - - //Return 5 for "-logfmt" option with "H" - { - int argc = 3; - char *argv[3]; - argv[0] = "./program"; - argv[1] = "-logfmt"; - argv[2] = "H"; - int rc = psArgumentVerbosity(&argc, argv); - ok(rc == 5, "psArgumentVerbosity: return 5 for '-logfmt H' argument inputs (was %d)", rc); - } - - //Return 5 for "-trace" option - { - int argc = 2; - char *argv[2]; - argv[0] = "./program"; - argv[1] = "-trace"; - int rc = psArgumentVerbosity(&argc, argv); - ok(rc == 5, "psArgumentVerbosity: return 5 for '-trace' argument input (was %d)", rc); - } - - //Return 5 for "-trace 1 2" option - { - int argc = 4; - char *argv[4]; - argv[0] = "./program"; - argv[1] = "-trace"; - argv[2] = "1"; - argv[3] = "2"; - int rc = psArgumentVerbosity(&argc, argv); - ok(rc == 5, "psArgumentVerbosity: return 5 for '-trace 1 2' argument inputs (was %d", rc); - } - - //Return 5 for "-trace-levels" option - { - int argc = 2; - char *argv[2]; - argv[0] = "./program"; - argv[1] = "-trace-levels"; - int rc = psArgumentVerbosity(&argc, argv); - ok(rc == 5, "psArgumentVerbosity: return 5 for '-trace-levels' argument input (was %d)", rc); - } + + // define the sample arguments + char *argv[20]; + argv[0] = "./program"; + argv[1] = "-string"; + argv[2] = "new"; + argv[3] = "-float"; + argv[4] = "6.66"; + argv[5] = "-double"; + argv[6] = "0.666"; + argv[7] = "-int"; + argv[8] = "8"; + argv[9] = "16"; + argv[10] = "32"; + argv[11] = "64"; + argv[12] = "-U8"; + argv[13] = "1"; + argv[14] = "-U16"; + argv[15] = "666"; + argv[16] = "-U32"; + argv[17] = "666"; + argv[18] = "-Bool"; + argv[19] = "true"; + int argc = 20; + + // setup the argument definition + psMetadata *args = psMetadataAlloc(); + + // three simple types + psMetadataAdd(args, PS_LIST_TAIL, "-string", PS_DATA_STRING, "Test String", "SomeString"); + psMetadataAdd(args, PS_LIST_TAIL, "-float", PS_DATA_F32, "Test Float", 0.666); + psMetadataAdd(args, PS_LIST_TAIL, "-double", PS_DATA_F64, "Test Double", 0.666); + + // a multiple argument option : -int 1 2 3 4 + psMetadata *ints = psMetadataAlloc(); + psMetadataAdd(ints, PS_LIST_TAIL, "int1", PS_DATA_S8, "Int1", 8); + psMetadataAdd(ints, PS_LIST_TAIL, "int2", PS_DATA_S16, "Int2", 16); + psMetadataAdd(ints, PS_LIST_TAIL, "int3", PS_DATA_S32, "Int3", 32); + psMetadataAdd(ints, PS_LIST_TAIL, "int4", PS_DATA_S64, "Int4", 64); + psMetadataAdd(args, PS_LIST_TAIL, "-int", PS_DATA_METADATA, "Integers", ints); + psFree(ints); // Drop reference + + // a multiple option example : -multi 1 -multi 2 + psMetadataAddS32(args, PS_LIST_TAIL, "-multi", 0, "666", 2); + psMetadataAddS32(args, PS_LIST_TAIL, "-multi", PS_META_DUPLICATE_OK, "hello kitty", 1); + + // simple psLib types + psMetadataAddU8(args, PS_LIST_TAIL, "-U8", 0, "U8", 1); + psMetadataAddU16(args, PS_LIST_TAIL, "-U16", 0, "U16", 666); + psMetadataAddU32(args, PS_LIST_TAIL, "-U32", 0, "U32", 666); + psMetadataAddU64(args, PS_LIST_TAIL, "-U64", 0, "U64", 666); + psMetadataAddBool(args, PS_LIST_TAIL, "-Bool", 0, "boolean", true); + + // attempt to parse the above arguments using the above argument definition + ok( psArgumentParse(args, &argc, argv), "psArgumentParse: return true for valid inputs."); + + // Check for Memory leaks + psFree(args); + checkMem(); + ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks"); + + } + + // other basic tests + { + psMemId id = psMemGetId(); + + // Return false for inconsistent argc in metadata + { + psMetadata *tempArg = psMetadataAlloc(); + psMetadata *mdtemp = psMetadataAlloc(); + psMetadataAdd(mdtemp, PS_LIST_TAIL, "int1", PS_DATA_S8, "Int1", 8); + psMetadataAdd(mdtemp, PS_LIST_TAIL, "int2", PS_DATA_S16, "Int2", 16); + psMetadataAdd(mdtemp, PS_LIST_TAIL, "int3", PS_DATA_S32, "Int3", 32); + psMetadataAdd(tempArg, PS_LIST_TAIL, "-int", PS_DATA_METADATA, "Integers", mdtemp); + psFree(mdtemp); + + int argc = 2; + char *argv[2]; + argv[0] = "./program"; + argv[1] = "-string"; + ok( !psArgumentParse(tempArg, &argc, argv), + "psArgumentParse: return false for inconsistent argc."); + psFree(tempArg); + } + + // setup the argument definition + psMetadata *args = psMetadataAlloc(); + + // three simple types + psMetadataAdd(args, PS_LIST_TAIL, "-string", PS_DATA_STRING, "Test String", "SomeString"); + psMetadataAddS32(args, PS_LIST_TAIL, "-multi", 0, "666", 2); + psMetadataAddS32(args, PS_LIST_TAIL, "-multi", PS_META_DUPLICATE_OK, "hello kitty", 1); + + // Return false for argc = 1 + { + int argc = 2; + char *argv[2]; + argv[0] = "./program"; + argv[1] = "-string"; + ok( !psArgumentParse(args, &argc, argv), + "psArgumentParse: return false for incomplete string syntax."); + } + + // Return true for an unfound MULTI match + { + int argc = 3; + char *argv[3]; + argv[0] = "./program"; + argv[1] = "-multi"; + argv[2] = "2"; + ok( psArgumentParse(args, &argc, argv), + "psArgumentParse: return true for MULTI."); + } + + // Check for Memory leaks + { + psFree(args); + checkMem(); + } + ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks"); + } + + // test psArgumentVerbosity() + { + psMemId id = psMemGetId(); + // Return 2 (default) for NULL input argument + { + int argc = 1; + ok( psArgumentVerbosity(&argc, NULL) == 2, + "psArgumentVerbosity: return 2 for NULL argument input."); + } + + // Return 2 for NULL argc input + { + char *argv[1]; + argv[0] = "./program"; + ok( psArgumentVerbosity(NULL, argv) == 2, + "psArgumentVerbosity: return 2 for NULL argument input."); + } + + // Return 3 for "-v" option + { + int argc = 2; + char *argv[2]; + argv[0] = "./program"; + argv[1] = "-v"; + ok( psArgumentVerbosity(&argc, argv) == 3, + "psArgumentVerbosity: return 3 for '-v' argument input."); + } + + // Return 4 for "-vv" option + { + int argc = 2; + char *argv[2]; + argv[0] = "./program"; + argv[1] = "-vv"; + ok( psArgumentVerbosity(&argc, argv) == 4, + "psArgumentVerbosity: return 4 for '-vv' argument input."); + } + + // Return 5 for "-vvv" option + { + int argc = 2; + char *argv[2]; + argv[0] = "./program"; + argv[1] = "-vvv"; + ok( psArgumentVerbosity(&argc, argv) == 5, + "psArgumentVerbosity: return 5 for '-vvv' argument input."); + } + + // These routines should return 5 since that was the last level set above with -vvv + // Return 5 for "-logfmt" option + { + int argc = 2; + char *argv[2]; + argv[0] = "./program"; + argv[1] = "-logfmt"; + int rc = psArgumentVerbosity(&argc, argv); + ok(rc == 5, "psArgumentVerbosity: return 5 for '-logfmt' argument input (was %d)", rc); + } + + // Return 5 for "-logfmt" option with "H" + { + int argc = 3; + char *argv[3]; + argv[0] = "./program"; + argv[1] = "-logfmt"; + argv[2] = "H"; + int rc = psArgumentVerbosity(&argc, argv); + ok(rc == 5, "psArgumentVerbosity: return 5 for '-logfmt H' argument inputs (was %d)", rc); + } + + // Return 5 for "-trace" option + { + int argc = 2; + char *argv[2]; + argv[0] = "./program"; + argv[1] = "-trace"; + int rc = psArgumentVerbosity(&argc, argv); + ok(rc == 5, "psArgumentVerbosity: return 5 for '-trace' argument input (was %d)", rc); + } + + // Return 5 for "-trace 1 2" option + { + int argc = 4; + char *argv[4]; + argv[0] = "./program"; + argv[1] = "-trace"; + argv[2] = "1"; + argv[3] = "2"; + // XXX EAM : we are getting unneeded output because of the verbosity set above. + int rc = psArgumentVerbosity(&argc, argv); + ok(rc == 5, "psArgumentVerbosity: return 5 for '-trace 1 2' argument inputs (was %d", rc); + } + + // Return 5 for "-trace-levels" option + { + // this function sends output to the screen or /dev/null (i + # if (!DEBUG) + FILE *f = fopen ("/dev/null", "w"); + int fd = fileno(f); + psTraceSetDestination (fd); + # endif + + int argc = 2; + char *argv[2]; + argv[0] = "./program"; + argv[1] = "-trace-levels"; + int rc = psArgumentVerbosity(&argc, argv); + ok(rc == 5, "psArgumentVerbosity: return 5 for '-trace-levels' argument input (was %d)", rc); + } + ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks"); } } @@ -325,117 +378,117 @@ /* XXX: Why is this commented out? -void testLogTraceArguments(void) -{ - note(" >>>Test 3: psLogArguments & psTraceArguments Fxns"); + void testLogTraceArguments(void) + { + note(" >>>Test 3: psLogArguments & psTraceArguments Fxns"); - //Return 2 (default) for NULL arguments input - { - int argc = 4; - ok( psLogArguments(&argc, NULL) == 2, - "psLogArguments: return 2 for NULL argument input."); - } - //Return 2 (default) for NULL argc input - { - char *argv[1]; - argv[0] = "./program"; - ok( psLogArguments(NULL, argv) == 2, - "psLogArguments: return 2 for NULL argc input."); - } - //Return 3 for "-v" option - { - int argc = 2; - char *argv[2]; - argv[0] = "./program"; - argv[1] = "-v"; - ok( psLogArguments(&argc, argv) == 3, - "psLogArguments: return 3 for '-v' argument input."); - } - //Return 4 for "-vv" option - { - int argc = 2; - char *argv[2]; - argv[0] = "./program"; - argv[1] = "-vv"; - ok( psLogArguments(&argc, argv) == 4, - "psLogArguments: return 4 for '-vv' argument input."); - } - //Return 5 for "-vvv" option - { - int argc = 2; - char *argv[2]; - argv[0] = "./program"; - argv[1] = "-vvv"; - ok( psLogArguments(&argc, argv) == 5, - "psLogArguments: return 5 for '-vvv' argument input."); - } - //Return 2 for "-logfmt" option - { - int argc = 2; - char *argv[2]; - argv[0] = "./program"; - argv[1] = "-logfmt"; - ok( psLogArguments(&argc, argv) == 2, - "psLogArguments: return 2 for '-logfmt' argument input."); - } - //Return 2 for "-logfmt" option with "H" - { - int argc = 3; - char *argv[3]; - argv[0] = "./program"; - argv[1] = "-logfmt"; - argv[2] = "H"; - ok( psLogArguments(&argc, argv) == 2, - "psLogArguments: return 2 for '-logfmt H' argument inputs."); - } + // Return 2 (default) for NULL arguments input + { + int argc = 4; + ok( psLogArguments(&argc, NULL) == 2, + "psLogArguments: return 2 for NULL argument input."); + } + // Return 2 (default) for NULL argc input + { + char *argv[1]; + argv[0] = "./program"; + ok( psLogArguments(NULL, argv) == 2, + "psLogArguments: return 2 for NULL argc input."); + } + // Return 3 for "-v" option + { + int argc = 2; + char *argv[2]; + argv[0] = "./program"; + argv[1] = "-v"; + ok( psLogArguments(&argc, argv) == 3, + "psLogArguments: return 3 for '-v' argument input."); + } + // Return 4 for "-vv" option + { + int argc = 2; + char *argv[2]; + argv[0] = "./program"; + argv[1] = "-vv"; + ok( psLogArguments(&argc, argv) == 4, + "psLogArguments: return 4 for '-vv' argument input."); + } + // Return 5 for "-vvv" option + { + int argc = 2; + char *argv[2]; + argv[0] = "./program"; + argv[1] = "-vvv"; + ok( psLogArguments(&argc, argv) == 5, + "psLogArguments: return 5 for '-vvv' argument input."); + } + // Return 2 for "-logfmt" option + { + int argc = 2; + char *argv[2]; + argv[0] = "./program"; + argv[1] = "-logfmt"; + ok( psLogArguments(&argc, argv) == 2, + "psLogArguments: return 2 for '-logfmt' argument input."); + } + // Return 2 for "-logfmt" option with "H" + { + int argc = 3; + char *argv[3]; + argv[0] = "./program"; + argv[1] = "-logfmt"; + argv[2] = "H"; + ok( psLogArguments(&argc, argv) == 2, + "psLogArguments: return 2 for '-logfmt H' argument inputs."); + } - //psTraceArguments Tests - //Return 0 (default) for NULL arguments input - { - int argc = 4; - ok( psTraceArguments(&argc, NULL) == 0, - "psTraceArguments: return 0 for NULL argument input."); - } - //Return 0 (default) for NULL argc input - { - char *argv[1]; - argv[0] = "./program"; - ok( psTraceArguments(NULL, argv) == 0, - "psTraceArguments: return 0 for NULL argc input."); - } - //Return 0 for "-trace" option - { - int argc = 2; - char *argv[2]; - argv[0] = "./program"; - argv[1] = "-trace"; - ok( psTraceArguments(&argc, argv) == 0, - "psTraceArguments: return 2 for '-trace' argument input."); - } - //Return 2 for "-trace 1 2" option - { - int argc = 4; - char *argv[4]; - argv[0] = "./program"; - argv[1] = "-trace"; - argv[2] = "1"; - argv[3] = "2"; - ok( psTraceArguments(&argc, argv) == 1, - "psTraceArguments: return 2 for '-trace 1 2' argument inputs."); - } - //Return 2 for "-trace-levels" option - { - int argc = 2; - char *argv[2]; - argv[0] = "./program"; - argv[1] = "-trace-levels"; - ok( psTraceArguments(&argc, argv) == 0, - "psTraceArguments: return 2 for '-trace-levels' argument input."); - } + // psTraceArguments Tests + // Return 0 (default) for NULL arguments input + { + int argc = 4; + ok( psTraceArguments(&argc, NULL) == 0, + "psTraceArguments: return 0 for NULL argument input."); + } + // Return 0 (default) for NULL argc input + { + char *argv[1]; + argv[0] = "./program"; + ok( psTraceArguments(NULL, argv) == 0, + "psTraceArguments: return 0 for NULL argc input."); + } + // Return 0 for "-trace" option + { + int argc = 2; + char *argv[2]; + argv[0] = "./program"; + argv[1] = "-trace"; + ok( psTraceArguments(&argc, argv) == 0, + "psTraceArguments: return 2 for '-trace' argument input."); + } + // Return 2 for "-trace 1 2" option + { + int argc = 4; + char *argv[4]; + argv[0] = "./program"; + argv[1] = "-trace"; + argv[2] = "1"; + argv[3] = "2"; + ok( psTraceArguments(&argc, argv) == 1, + "psTraceArguments: return 2 for '-trace 1 2' argument inputs."); + } + // Return 2 for "-trace-levels" option + { + int argc = 2; + char *argv[2]; + argv[0] = "./program"; + argv[1] = "-trace-levels"; + ok( psTraceArguments(&argc, argv) == 0, + "psTraceArguments: return 2 for '-trace-levels' argument input."); + } - //Check for Memory leaks - { - checkMem(); - } -} + // Check for Memory leaks + { + checkMem(); + } + } */ Index: /branches/eam_branch_20080430/psLib/test/types/tap_psBitSet_all.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/types/tap_psBitSet_all.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/types/tap_psBitSet_all.c (revision 17502) @@ -20,5 +20,5 @@ psLogSetFormat("HLNM"); psLogSetLevel(PS_LOG_INFO); - plan_tests(32); + plan_tests(31); @@ -49,5 +49,5 @@ } //Make sure psMemCheckBitSet works correctly - return false - { + if (0) { int j = 2; ok( !psMemCheckBitSet(&j), Index: /branches/eam_branch_20080430/psLib/test/types/tap_psHash_all.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/types/tap_psHash_all.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/types/tap_psHash_all.c (revision 17502) @@ -23,5 +23,5 @@ int main(void) { - plan_tests(25); + plan_tests(24); note("Tests for psHash Functions"); @@ -60,5 +60,5 @@ } //Make sure psMemCheckHash works correctly - return false - { + if (0) { int j = 2; ok( !psMemCheckHash(&j), Index: /branches/eam_branch_20080430/psLib/test/types/tap_psList_all.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/types/tap_psList_all.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/types/tap_psList_all.c (revision 17502) @@ -22,5 +22,5 @@ psLogSetFormat("HLNM"); psLogSetLevel(PS_LOG_INFO); - plan_tests(62); + plan_tests(61); // Test 1: psList Creation Fxns"); @@ -50,5 +50,5 @@ } //Make sure psMemCheckList works correctly - return false - { + if (0) { int j = 2; ok( !psMemCheckList(&j), Index: /branches/eam_branch_20080430/psLib/test/types/tap_psLookupTable_all.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/types/tap_psLookupTable_all.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/types/tap_psLookupTable_all.c (revision 17502) @@ -24,5 +24,5 @@ psLogSetFormat("HLNM"); psLogSetLevel(PS_LOG_INFO); - plan_tests(31); + plan_tests(32); // Tests for psLookupTable Functions @@ -57,5 +57,5 @@ //Tests for psMemCheckArray //Make sure psMemCheckArray works correctly - return false - { + if (0) { int j = 2; ok( !psMemCheckLookupTable(&j), @@ -147,11 +147,16 @@ " constructed row."); } - //Attempt to read with valid inputs - { - outVec = psVectorsReadFromFile("types/table.dat", - "\%f \%d \%d \%ld \%d \%d \%d \%ld \%*d \%lf"); - ok( outVec != NULL && outVec->n == 9 && - ((psVector*)(outVec->data[6]))->data.S32[1] == -8, - "psVectorsReadFromFile: return correct array for valid format input."); + // Attempt to read with valid inputs + { + outVec = psVectorsReadFromFile("table.dat", + "\%f \%d \%d \%ld \%d \%d \%d \%ld \%*d \%lf"); + ok(outVec, "psVectorsReadFromFile: read vectors from file"); + + skip_start (!outVec, 2, "skipping tests using the invalid null array"); + ok(outVec->n == 9, "psVectorsReadFromFile: read correct number of vectors"); + + psVector *tmpVec = outVec->data[6]; + ok(tmpVec->data.S32[1] == -8, "psVectorsReadFromFile: selected data element has correct value."); + skip_end(); } @@ -182,5 +187,5 @@ // Attempt to read valid table psFree(table1); - table1 = psLookupTableAlloc("types/table.dat", + table1 = psLookupTableAlloc("table.dat", "\%f \%d \%d \%ld \%d \%d \%d \%ld \%*d \%lf", 0); numRows = psLookupTableRead(table1); @@ -199,5 +204,5 @@ //Attempt to import table with unsorted array column psFree(table1); - table1 = psLookupTableAlloc("types/table.dat", + table1 = psLookupTableAlloc("table.dat", "\%f \%d \%d \%ld \%d \%d \%d \%ld \%*d \%lf", 0); { @@ -220,9 +225,9 @@ psVector *vec = NULL; // XXX: Remove the "types" path here - table1 = psLookupTableAlloc("types/table.dat", + table1 = psLookupTableAlloc("table.dat", "\%f \%d \%d \%ld \%d \%d \%d \%ld \%*d \%lf", 0); psLookupTable *table2 = NULL; // XXX: Remove the "types" path here - table2 = psLookupTableAlloc("types/table.dat", + table2 = psLookupTableAlloc("table.dat", "\%f \%d \%d \%ld \%d \%d \%d \%ld \%*d \%lf", 0); psLookupTableRead(table2); @@ -243,4 +248,5 @@ ok(table2->values != NULL, "table->values not NULL"); + skip_start (!table2->values, 3, "skipping for failed table load"); //Return NULL for table with table->values->n == 0 { @@ -267,4 +273,5 @@ skip_end(); } + skip_end(); //Remaining tests for psLookupTableInterpolate Index: /branches/eam_branch_20080430/psLib/test/types/tap_psMetadataConfigFormat.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/types/tap_psMetadataConfigFormat.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/types/tap_psMetadataConfigFormat.c (revision 17502) @@ -18,5 +18,5 @@ psLogSetFormat("HLNM"); psLogSetLevel(PS_LOG_INFO); - plan_tests(16 + 1); + plan_tests(18); psMetadata *md = NULL; @@ -27,6 +27,5 @@ psMemId id = psMemGetId(); out = psMetadataConfigFormat(md); - ok( out == NULL, - "psMetadataConfigFormat: return NULL for NULL metadata input."); + ok( !out, "psMetadataConfigFormat: return NULL for NULL metadata input."); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } @@ -37,6 +36,9 @@ md = psMetadataAlloc(); out = psMetadataConfigFormat(md); - ok( out == NULL, - "psMetadataConfigFormat: return NULL for empty metadata input."); + ok( out, "psMetadataConfigFormat: return valid string for empty metadata input."); + skip_start (!out, 1, "failed to build valid string"); + ok( *out == 0, "psMetadataConfigFormat: return empty string for empty metadata input."); + psFree (out); + skip_end(); } Index: /branches/eam_branch_20080430/psLib/test/types/tap_psMetadataConfigPrint.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/types/tap_psMetadataConfigPrint.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/types/tap_psMetadataConfigPrint.c (revision 17502) @@ -35,5 +35,5 @@ - //Return false for empty metadata input + // Return true for empty metadata input (creates an empty file; is not an error) { psMemId id = psMemGetId(); @@ -41,6 +41,5 @@ psMetadata *md = psMetadataAlloc(); - ok(!psMetadataConfigPrint(openfile, md), - "return false for empty metadata input."); + ok(psMetadataConfigPrint(openfile, md), "return true for empty metadata input."); psFree(md); Index: /branches/eam_branch_20080430/psLib/test/types/tap_psMetadataConfigWrite.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/types/tap_psMetadataConfigWrite.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/types/tap_psMetadataConfigWrite.c (revision 17502) @@ -53,10 +53,9 @@ - //Return false for empty metadata input + // Return true for empty metadata input (creates an empty file) { psMemId id = psMemGetId(); psMetadata *md = psMetadataAlloc(); - ok( !psMetadataConfigWrite(md, "mdcfg.wrt"), - "return false for empty metadata input."); + ok(psMetadataConfigWrite(md, "mdcfg.wrt"), "return false for empty metadata input."); psFree(md); ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks"); Index: /branches/eam_branch_20080430/psLib/test/types/tap_psMetadataConfig_input.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/types/tap_psMetadataConfig_input.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/types/tap_psMetadataConfig_input.c (revision 17502) @@ -129,5 +129,5 @@ ok(item->type == PS_DATA_METADATA, "metadataItem type"); - is_str(item->comment, "", "metadataItem comment"); + is_str(item->comment, "duplicate", "metadataItem comment"); skip_end(); psFree(md); Index: /branches/eam_branch_20080430/psLib/test/types/tap_psMetadataOverlay.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/types/tap_psMetadataOverlay.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/types/tap_psMetadataOverlay.c (revision 17502) @@ -13,4 +13,6 @@ #include "pstap.h" +#define DEBUG 0 + int main(void) { @@ -35,5 +37,5 @@ bool status = psMetadataOverlay (out, in); - psMetadataPrint (stderr, out, 1); + if (DEBUG) psMetadataPrint (stderr, out, 1); ok (status, "psMetadataOverlay : overlay two MDs"); @@ -65,5 +67,5 @@ bool status = psMetadataOverlay (out, in); - psMetadataPrint (stderr, out, 1); + if (DEBUG) psMetadataPrint (stderr, out, 1); ok (status, "psMetadataOverlay : overlay two MDs"); @@ -96,5 +98,5 @@ bool status = psMetadataOverlay (out, in); - psMetadataPrint (stderr, out, 1); + if (DEBUG) psMetadataPrint (stderr, out, 1); ok (status, "psMetadataOverlay : overlay two MDs"); @@ -132,5 +134,5 @@ bool status = psMetadataOverlay (out, in); - psMetadataPrint (stderr, out, 1); + if (DEBUG) psMetadataPrint (stderr, out, 1); ok (status, "psMetadataOverlay : overlay two MDs"); @@ -183,5 +185,5 @@ bool status = psMetadataOverlay (out, in); - psMetadataPrint (stderr, out, 1); + if (DEBUG) psMetadataPrint (stderr, out, 1); ok (status, "psMetadataOverlay : overlay two MDs"); @@ -223,5 +225,5 @@ bool status = psMetadataOverlay (out, in); - psMetadataPrint (stderr, out, 1); + if (DEBUG) psMetadataPrint (stderr, out, 1); ok (status, "psMetadataOverlay : overlay two MDs"); @@ -274,5 +276,5 @@ bool status = psMetadataOverlay (out, in); - psMetadataPrint (stderr, out, 1); + if (DEBUG) psMetadataPrint (stderr, out, 1); ok (status, "psMetadataOverlay : overlay two MDs"); Index: /branches/eam_branch_20080430/psLib/test/types/tap_psMetadata_creating.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/types/tap_psMetadata_creating.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/types/tap_psMetadata_creating.c (revision 17502) @@ -22,5 +22,5 @@ psLogSetFormat("HLNM"); psLogSetLevel(PS_LOG_INFO); - plan_tests(44); + plan_tests(42); // psMetadata & psMetadataItem Creation Functions @@ -227,5 +227,6 @@ //Make sure MemCheckItem worked. Try primitive type. Expect false. - { + // XXX EAM : disabled + if (0) { int j = 2; ok( !psMemCheckMetadataItem(&j), @@ -262,5 +263,6 @@ } //Make sure MemCheck worked. Try primitive type. Expect false. - { + // XXX EAM : disabled + if (0) { int j = 2; ok( !psMemCheckMetadata(&j), Index: /branches/eam_branch_20080430/psLib/test/types/tap_psMetadata_manip.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/types/tap_psMetadata_manip.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/types/tap_psMetadata_manip.c (revision 17502) @@ -19,5 +19,5 @@ { psLogSetFormat("HLNM"); - psLogSetLevel(PS_LOG_INFO); + psLogSetLevel(PS_LOG_WARN); plan_tests(50); // psMetadataLookup, Remove, and Iterator Fxns Index: /branches/eam_branch_20080430/psLib/test/types/tap_psPixels_all.c =================================================================== --- /branches/eam_branch_20080430/psLib/test/types/tap_psPixels_all.c (revision 17501) +++ /branches/eam_branch_20080430/psLib/test/types/tap_psPixels_all.c (revision 17502) @@ -21,5 +21,5 @@ int main(void) { - plan_tests(49); + plan_tests(48); //Tests for psPixels Functions @@ -51,5 +51,6 @@ } //Make sure psMemCheckPixels works correctly - return false - { + // XXX EAM : disabled -- failing test causes segfault + if (0) { int j = 2; ok(!psMemCheckPixels(&j), @@ -392,4 +393,2 @@ } } - -