Index: trunk/psLib/test/astronomy/.cvsignore =================================================================== --- trunk/psLib/test/astronomy/.cvsignore (revision 3684) +++ trunk/psLib/test/astronomy/.cvsignore (revision 3690) @@ -7,16 +7,7 @@ tst_psTime_01 tst_psTime_02 -tst_psMetadata05_OUT -tst_psMetadata_01 -tst_psMetadata_02 -tst_psMetadata_03 -tst_psMetadata_04 -tst_psMetadata_05 -tst_psMetadata_06 tst_psAstrometry tst_psAstrometry01 tst_psCoord -tst_psMetadataIO -tst_psMetadata_07 tst_psTime_03 tst_psTime_04 @@ -26,9 +17,5 @@ .deps .libs -header_1.fits -header_2.fits -test.config test.ser7.dat tst_psCoord01 -tst_psDB Index: trunk/psLib/test/astronomy/Makefile.am =================================================================== --- trunk/psLib/test/astronomy/Makefile.am (revision 3684) +++ trunk/psLib/test/astronomy/Makefile.am (revision 3690) @@ -12,5 +12,4 @@ AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS) -AM_CFLAGS = -DXML_CONFIG_FILE="\"$(top_srcdir)/etc/pslib/psTime.xml\"" TESTS = tst_psTime_01 \ @@ -18,15 +17,6 @@ tst_psTime_03 \ tst_psTime_04 \ - tst_psMetadataIO \ - tst_psMetadata_01 \ - tst_psMetadata_02 \ - tst_psMetadata_03 \ - tst_psMetadata_04 \ - tst_psMetadata_05 \ - tst_psMetadata_06 \ - tst_psMetadata_07 \ tst_psCoord \ tst_psCoord01 \ - @TST_PSDB@ \ tst_psAstrometry \ tst_psAstrometry01 @@ -34,17 +24,12 @@ check_PROGRAMS = $(TESTS) -check_DATA = test.config \ - psTime.config \ +check_DATA = psTime.config \ test.psTime.config1 \ test.psTime.config2 \ test.psTime.config3 \ test.psTime.config4 \ - header_1.fits \ - header_2.fits \ test.ser7.dat TESTS_ENVIRONMENT = export PS_CONFIG_FILE="psTime.config" && perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified - -EXTRA_PROGRAMS = tst_psDB tests: $(check_DATA) $(TESTS) @@ -54,13 +39,4 @@ tst_psTime_03_SOURCES = tst_psTime_03.c tst_psTime_04_SOURCES = tst_psTime_04.c -tst_psDB_SOURCES = tst_psDB.c -tst_psMetadataIO_SOURCES = tst_psMetadataIO.c -tst_psMetadata_01_SOURCES = tst_psMetadata_01.c -tst_psMetadata_02_SOURCES = tst_psMetadata_02.c -tst_psMetadata_03_SOURCES = tst_psMetadata_03.c -tst_psMetadata_04_SOURCES = tst_psMetadata_04.c -tst_psMetadata_05_SOURCES = tst_psMetadata_05.c -tst_psMetadata_06_SOURCES = tst_psMetadata_06.c -tst_psMetadata_07_SOURCES = tst_psMetadata_07.c tst_psAstrometry_SOURCES = tst_psAstrometry.c tst_psCoord_SOURCES = tst_psCoord.c @@ -72,7 +48,4 @@ data/test.psTime.config3.template \ data/test.psTime.config4.template \ - data/header_1.fits \ - data/header_2.fits \ - data/test.config \ data/test.ser7.dat \ verified @@ -95,13 +68,4 @@ cp $? $@ -test.config: data/test.config - cp $? $@ - -header_1.fits: data/header_1.fits - cp $? $@ - -header_2.fits: data/header_2.fits - cp $? $@ - test.ser7.dat: data/test.ser7.dat cp $? $@ Index: trunk/psLib/test/astronomy/data/header_1.fits =================================================================== --- trunk/psLib/test/astronomy/data/header_1.fits (revision 3684) +++ (revision ) @@ -1,1 +1,0 @@ -SIMPLE = T / file does conform to FITS standard BITPIX = 8 / number of bits per data pixel NAXIS = 0 / number of data axes HISTORY File modified by user 'harman' with fv on 2004-08-04T11:11:18 END Index: trunk/psLib/test/astronomy/data/header_2.fits =================================================================== --- trunk/psLib/test/astronomy/data/header_2.fits (revision 3684) +++ (revision ) @@ -1,1 +1,0 @@ -SIMPLE = T / file does conform to FITS standard BITPIX = -64 / number of bits per data pixel NAXIS = 1 / number of data axes NAXIS1 = 64 / length of data axis 1 EXTEND = T / FITS dataset may contain extensions COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H END XTENSION= 'IMAGE ' / IMAGE extension BITPIX = -64 / number of bits per data pixel NAXIS = 1 / number of data axes NAXIS1 = 64 / length of data axis 1 PCOUNT = 0 / required keyword; must = 0 GCOUNT = 1 / required keyword; must = 1 BITPIX = -64 / number of bits per data pixel EXTNAME = 'MY_DATA_1' HISTORY File modified by user 'harman' with fv on 2004-08-04T13:14:45 HISTORY File modified by user 'harman' with fv on 2004-08-04T13:15:29 HISTORY File modified by user 'harman' with fv on 2004-08-04T13:21:18 HISTORY File modified by user 'harman' with fv on 2004-08-04T13:21:46 END XTENSION= 'IMAGE ' / IMAGE extension BITPIX = -64 / number of bits per data pixel NAXIS = 1 / number of data axes NAXIS1 = 64 / length of data axis 1 PCOUNT = 0 / required keyword; must = 0 GCOUNT = 1 / required keyword; must = 1 EXTNAME = 'MY_DATA_2' HISTORY File modified by user 'harman' with fv on 2004-08-04T13:22:12 HISTORY File modified by user 'harman' with fv on 2004-08-04T13:22:52 END Index: trunk/psLib/test/astronomy/data/test.config =================================================================== --- trunk/psLib/test/astronomy/data/test.config (revision 3684) +++ (revision ) @@ -1,128 +1,0 @@ -########################################################################################################## -# test.config -# -# This is a sample metadata configuration file used to test the metadata configuration file parser. -# It tests both positive and negative cases as described in the comments below. -# -# author Ross Harman, MHPCC -# -# version $Revision: 1.2 $ $Name: not supported by cvs2svn $ -# date $Date: 2005-03-07 20:58:50 $ -# -# Copyright 2004 Maui High Performance Computing Center, University of Hawaii -########################################################################################################## -# -# -# -########## Test 1 ########## -# Lines beginning with # are comments. The line below, as well as those above are comments. They should be ignored by the parser. -# I am a comment. -# -# -# -########## Test 2 ########## -# The line below is a comment that begins with some whitespace. It should be ignored by the parser. - # Another comment -# -# -# -########## Test 3 ########## -# The line below is completely blank except for a carriage return. It should be ignored by the parser. - -# -# -# -########## Test 4 ########## -# The line below consists of spaces and tabs (whitespace). It should be ignored by the parser. - -# -# -# -########## Test 5 ########## -# The line below consists of a variable name, type, value, and trailing comment. It should be read by the parser -pi F64 3.1415926535897932384626433832795029 # Definition of pi -# -# -# -########## Test 6 ########## -# The line below consists of a variable name, type, and value, but without a trailing comment. It should be read by the parser. -altitude S32 10000 -# -# -# -########## Test 7 ########## -# The lines below contain variations in name, type, value, trailing comment, and whitespace. They should all be read by the parser. - time F32 1234.5678 - myBool BOOL F # F, f, 0, T, t, 1 are also acceptable -title1 STR Hello world #This is a comment for the string value - title2 STRING Good bye world # STRING or STR may be used as the string type -# -# -# -########## Test 8 ########## -# The line below creates a vector. It should be read by the parser. -@primes S32 2, 3, 5, 7, 11, 13, 17 # These are prime numbers -# -# -# -########## Test 9 ########## -# The line below creates a vector with commas mixed with spaces in the values. It should be read by the parser. -@negatives S32 -1, -2 -3 -4, -5, -6, -7 -# -# -# -########## Test 10 ########## -# The lines below should create a folder node with children that are strings. They should be read by the parser. -comment *STR This -comment *STR is -comment *STR an -comment *STR ugly -comment *STR comment -comment *STR but -comment *STR still -comment *STR valid -# -# -# -########## Test 11 ########## -# The line below contains an incorrect value. It should produce an error. -xPosition F64 9876.54qqq32 -# -# -# -########## Test 12 ########## -# The line below contains no value. It should produce an error. -yPosition F64 -# -# -# -########## Test 13 ########## -# The line below contains no type. It should produce an error. -zPosition 99.999 -# -# -# -########## Test 14 ########## -# The line below contains two * characters. It should produce an error. -aPosition ** -# -# -# -########## Test 15 ########## -# The line below contains two @ characters. It should produce an error. -@@bPosition F64 22.33 -# -# -# -########## Test 16 ########## -# The line below contains a ~ character used for special processing. It should produce an error. -range F64 140.0 ~ -# -# -# -########## Test 17 ########## -# The variable name below is repeated. It should produce an error if the overwrite function argument is set to false. -# If overwrite is true, then the last name and value will be stored and there will be no error. -speed F32 55.55 -speed F32 66.66 - Index: trunk/psLib/test/astronomy/tst_psAstrometry01.c =================================================================== --- trunk/psLib/test/astronomy/tst_psAstrometry01.c (revision 3684) +++ trunk/psLib/test/astronomy/tst_psAstrometry01.c (revision 3690) @@ -5,6 +5,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-07 20:27:41 $ +* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-09 00:04:57 $ * * XXX: Must test @@ -106,5 +106,5 @@ {\ NAME = (psPlaneTransform *) psAlloc(sizeof(psPlaneTransform)); \ - p_psMemSetDeallocator(NAME, (psFreeFcn) psPlaneTransformFree); \ + psMemSetDeallocator(NAME, (psFreeFcn) psPlaneTransformFree); \ NAME->x = psDPolynomial2DAlloc(2, 2, PS_POLYNOMIAL_ORD); \ NAME->y = psDPolynomial2DAlloc(2, 2, PS_POLYNOMIAL_ORD); \ @@ -116,5 +116,5 @@ {\ NAME = (psPlaneDistort *) psAlloc(sizeof(psPlaneDistort)); \ - p_psMemSetDeallocator(NAME, (psFreeFcn) psPlaneDistortFree); \ + psMemSetDeallocator(NAME, (psFreeFcn) psPlaneDistortFree); \ NAME->x = psDPolynomial4DAlloc(2, 2, 2, 2, PS_POLYNOMIAL_ORD); \ NAME->y = psDPolynomial4DAlloc(2, 2, 2, 2, PS_POLYNOMIAL_ORD); \ Index: trunk/psLib/test/astronomy/verified/tst_psDB.stderr =================================================================== --- trunk/psLib/test/astronomy/verified/tst_psDB.stderr (revision 3684) +++ (revision ) @@ -1,305 +1,0 @@ -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_psDB.c * -* TestPoint: psDB{dbInit} * -* TestType: Positive * -\**********************************************************************************/ - -