Index: trunk/psLib/test/astro/tap_psCoord.c =================================================================== --- trunk/psLib/test/astro/tap_psCoord.c (revision 13083) +++ trunk/psLib/test/astro/tap_psCoord.c (revision 13084) @@ -5,6 +5,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-01-19 20:42:21 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2007-05-01 00:08:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -366,6 +366,4 @@ ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } - /* HERE - */ } Index: trunk/psLib/test/astro/tap_psCoord01.c =================================================================== --- trunk/psLib/test/astro/tap_psCoord01.c (revision 13083) +++ trunk/psLib/test/astro/tap_psCoord01.c (revision 13084) @@ -12,8 +12,8 @@ * values were obtained, and they nearly all fail now. * -* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-02-06 04:11:54 $ -* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-02-06 04:11:54 $ +* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ +* @date $Date: 2007-05-01 00:08:52 $ +* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ +* @date $Date: 2007-05-01 00:08:52 $ * * Copyright 2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -995,5 +995,5 @@ - /* HERE + /* #define DEG_INC2 15.0 #define VERBOSE 0 Index: trunk/psLib/test/astro/tap_psCoord02.c =================================================================== --- trunk/psLib/test/astro/tap_psCoord02.c (revision 13083) +++ trunk/psLib/test/astro/tap_psCoord02.c (revision 13084) @@ -7,6 +7,6 @@ * XXX: These tests should probably be split among several files * -* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-02-06 01:01:05 $ +* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ +* @date $Date: 2007-05-01 00:08:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -509,5 +509,4 @@ // psPlaneTransformDeriv() // Ensure psPlaneTransformDeriv() returns NULL for NULL input plane - // psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message"); // Following should generate error message // XXX: un-NULL the first parameter since we test that above @@ -549,6 +548,4 @@ ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } - /* HERE - */ } Index: trunk/psLib/test/astro/tap_psEarthOrientation_corrections.c =================================================================== --- trunk/psLib/test/astro/tap_psEarthOrientation_corrections.c (revision 13083) +++ trunk/psLib/test/astro/tap_psEarthOrientation_corrections.c (revision 13084) @@ -11,8 +11,6 @@ * */ - #include #include - #include "tap.h" #include "pstap.h" @@ -28,7 +26,7 @@ int main(void) { + psLogSetFormat("HLNM"); + psLogSetLevel(PS_LOG_INFO); plan_tests(8); - -// diag("Tests for psEarthOrientation Correction Functions"); // Initialize library internal structures @@ -297,5 +295,5 @@ //Return NULL for NULL time input psEarthPole *pcorr = NULL; - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message"); + // Following should generate error message pcorr = psEOC_PrecessionCorr(empty, PS_IERS_A); if (pcorr != NULL) { @@ -306,5 +304,5 @@ //Return NULL for Invalid IERS table - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message"); + // Following should generate error message pcorr = psEOC_PrecessionCorr(time2, 3); if (pcorr != NULL) { @@ -464,5 +462,5 @@ //Return NULL for NULL input time - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message"); + // Following should generate error message eop = psEOC_PolarTideCorr(empty); if (eop != NULL) { @@ -501,5 +499,5 @@ //Return NULL for NULL input time. - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message"); + // Following should generate error message nute = psEOC_NutationCorr(empty); if (nute != NULL) { Index: trunk/psLib/test/fits/tap_psFits.c =================================================================== --- trunk/psLib/test/fits/tap_psFits.c (revision 13083) +++ trunk/psLib/test/fits/tap_psFits.c (revision 13084) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-01-30 21:32:57 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2007-05-01 00:08:52 $ * * XXXX: All of the makeTable() tests are failing, as well as one additional one. @@ -352,5 +352,5 @@ // check to see if given a bogus extension name, it errors. - psLogMsg(__func__,PS_LOG_INFO, "Following should be an error"); + // Following should be an error // XXX: Verify error if (psFitsMoveExtName(fits, "bogus") || psErrorGetStackSize() != 1) @@ -362,5 +362,5 @@ // check to see if given a NULL psFits, it errors. - psLogMsg(__func__,PS_LOG_INFO, "Following should be an error"); + // Following should be an error // XXX: Verify error if (psFitsMoveExtName(NULL, "bogus") || psErrorGetStackSize() != 1) @@ -372,5 +372,5 @@ // check to see if given a NULL extname, it errors. - psLogMsg(__func__,PS_LOG_INFO, "Following should be an error"); + // Following should be an error // XXX: Verify error if (psFitsMoveExtName(fits, NULL) || psErrorGetStackSize() != 1) @@ -384,5 +384,5 @@ // Attempt to get ext name from null fits file - psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error for NULL fits file"); + // Following should generate an error for NULL fits file if(psFitsGetExtName(NULL) != NULL) { Index: trunk/psLib/test/imageops/tap_psImageConvolve.c =================================================================== --- trunk/psLib/test/imageops/tap_psImageConvolve.c (revision 13083) +++ trunk/psLib/test/imageops/tap_psImageConvolve.c (revision 13084) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-03-03 01:23:32 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-05-01 00:08:52 $ * * XXX: Must test the tRelative parameter to psKernelGenerate() @@ -161,5 +161,5 @@ result->yMin, result->yMax, result->xMin, result->xMax); for (psS32 y = result->yMin; y <= result->yMax; y++) { - printf("HERE y is %d\n", y); + // printf("y is %d\n", y); for (psS32 x = result->xMin; x <= result->xMax; x++) { printf(" %6.2f ", result->kernel[y][x]); Index: trunk/psLib/test/imageops/tap_psImageGeomManip.c =================================================================== --- trunk/psLib/test/imageops/tap_psImageGeomManip.c (revision 13083) +++ trunk/psLib/test/imageops/tap_psImageGeomManip.c (revision 13084) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-04-26 22:18:03 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-05-01 00:08:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -568,5 +568,4 @@ -printf("HERE\n"); // testImageRotate() if (1) { Index: trunk/psLib/test/math/tap_psHist00.c =================================================================== --- trunk/psLib/test/math/tap_psHist00.c (revision 13083) +++ trunk/psLib/test/math/tap_psHist00.c (revision 13084) @@ -55,5 +55,5 @@ // XXX: How should we test these kinds of things? if (0) { - psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message."); + // Following should generate an error message psHistogram *myHist = psHistogramAlloc(higher, lower, 1); if (myHist != NULL) { Index: trunk/psLib/test/math/tap_psPolynomial.c =================================================================== --- trunk/psLib/test/math/tap_psPolynomial.c (revision 13083) +++ trunk/psLib/test/math/tap_psPolynomial.c (revision 13084) @@ -16,6 +16,6 @@ * XXX: Compare to FLT_EPSILON * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-12-21 20:05:12 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2007-05-01 00:08:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -77,5 +77,5 @@ if (0) { // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + // Following should generate error msg for negative terms if (psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, -1) != NULL) { diag("psPolynomial1DAlloc() Returned structure but expected NULL"); @@ -124,10 +124,10 @@ if (0) { // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + // Following should generate error msg for negative terms if (psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, -1, 1) != NULL) { diag("psPolynomial2DAlloc() returned structure but expected NULL"); } // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + // Following should generate error msg for negative terms if (psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 1, -1) != NULL) { diag("psPolynomial2DAlloc() returned structure but expected NULL"); @@ -181,15 +181,15 @@ if (0) { // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + // Following should generate error msg for negative terms if (psPolynomial3DAlloc(PS_POLYNOMIAL_ORD, -1, 1, 1) != NULL) { diag("psPolynomial3DAlloc(): returned structure but expected NULL"); } // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + // Following should generate error msg for negative terms if (psPolynomial3DAlloc(PS_POLYNOMIAL_ORD, 1, -1, 1) != NULL) { diag("psPolynomial3DAlloc() returned structure but expected NULL"); } // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + // Following should generate error msg for negative terms if (psPolynomial3DAlloc(PS_POLYNOMIAL_ORD, 1, 1, -1) != NULL) { diag("psPolynomial3DAlloc(): returned structure but expected NULL"); @@ -247,10 +247,10 @@ if (0) { // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + // Following should generate error msg for negative terms if (psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, -1, 1, 1, 1) != NULL) { diag("psPolynomial4DAlloc(): returned structure but expected NULL"); } // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + // Following should generate error msg for negative terms if (psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, 1, -1, 1, 1) != NULL) { diag("psPolynomial4DAlloc(): returned structure but expected NULL"); @@ -258,5 +258,5 @@ } // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + // Following should generate error msg for negative terms if (psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, 1, 1, -1, 1) != NULL) { diag("psPolynomial4DAlloc(): returned structure but expected NULL"); @@ -264,5 +264,5 @@ } // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + // Following should generate error msg for negative terms if (psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, 1, 1, 1, -1) != NULL) { diag("psPolynomial4DAlloc(): returned structure but expected NULL"); Index: trunk/psLib/test/math/tap_psRandom.c =================================================================== --- trunk/psLib/test/math/tap_psRandom.c (revision 13083) +++ trunk/psLib/test/math/tap_psRandom.c (revision 13084) @@ -267,5 +267,5 @@ psFree(myRNG1); - psLogMsg(__func__,PS_LOG_INFO,"Reset a NULL psRandom variable, should generate an error message"); + // Reset a NULL psRandom variable, should generate an error message psRandomReset(NULL,SEED); } Index: trunk/psLib/test/mathtypes/tap_psVector.c =================================================================== --- trunk/psLib/test/mathtypes/tap_psVector.c (revision 13083) +++ trunk/psLib/test/mathtypes/tap_psVector.c (revision 13084) @@ -468,5 +468,5 @@ ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); \ } -//HERE + // psVectorToString() tests TEST_VECTOR_TO_STRING(PS_TYPE_U8, 5, 1, 1, "[1,2,3,4,5]"); Index: trunk/psLib/test/sys/tap_psError.c =================================================================== --- trunk/psLib/test/sys/tap_psError.c (revision 13083) +++ trunk/psLib/test/sys/tap_psError.c (revision 13084) @@ -5,16 +5,14 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-04-25 01:07:08 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-05-01 00:08:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii * */ - #include #include #include #include - #include "pslib.h" #include "tap.h" @@ -39,4 +37,5 @@ { psLogSetFormat("HLNM"); + psLogSetLevel(PS_LOG_INFO); plan_tests(60); @@ -301,6 +300,4 @@ // Verify the return value of psErrorCodeString // psErrorCode code = PS_ERR_BAD_PARAMETER_VALUE; - // psLogMsg("tst_psError05", PS_LOG_INFO, psErrorCodeString(code)); - // Verify the return value of psErrorCodeString if code is negative ok( psErrorCodeString(-1) == NULL, "error string with neg. code"); @@ -359,5 +356,5 @@ b. an appropriate error is generated. */ - psLogMsg(__func__,PS_LOG_INFO,"Following should be an error."); + // Following should be an error psErrorClear(); psErrorRegister(NULL,1); @@ -379,3 +376,2 @@ } } -//HERE Index: trunk/psLib/test/sys/tap_psMemory.c =================================================================== --- trunk/psLib/test/sys/tap_psMemory.c (revision 13083) +++ trunk/psLib/test/sys/tap_psMemory.c (revision 13084) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-04-10 21:09:31 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2007-05-01 00:08:52 $ * * XXXX: Several tests fail with an Abort and are commented out. @@ -296,5 +296,4 @@ } -//HERE // memCheckTypes() if (1) { Index: trunk/psLib/test/sys/tap_psString.c =================================================================== --- trunk/psLib/test/sys/tap_psString.c (revision 13083) +++ trunk/psLib/test/sys/tap_psString.c (revision 13084) @@ -20,16 +20,14 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-04-10 21:09:31 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-05-01 00:08:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii * */ - #include #include "pslib.h" #include "tap.h" #include "pstap.h" - #define STR_0 "binky had a leeeetle lamb" @@ -409,5 +407,5 @@ char** test = NULL; //psStringCopy should return NULL for NULL input string - // psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message"); + // Following should generate error message output = psStringCopy(nullTest); ok(output == NULL, "psStringCopy to return NULL for NULL input string"); @@ -463,3 +461,2 @@ } } -// HERE Index: trunk/psLib/test/xml/tap_psXML.c =================================================================== --- trunk/psLib/test/xml/tap_psXML.c (revision 13083) +++ trunk/psLib/test/xml/tap_psXML.c (revision 13084) @@ -18,6 +18,6 @@ * XXXX: There are no data tests, he simple prints data to STDOUT * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-01-30 21:32:57 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2007-05-01 00:08:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -313,5 +313,3 @@ ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } - /* HERE - */ -} +}