Index: trunk/psLib/test/dataIO/Makefile.am =================================================================== --- trunk/psLib/test/dataIO/Makefile.am (revision 3286) +++ trunk/psLib/test/dataIO/Makefile.am (revision 3298) @@ -22,4 +22,6 @@ check_PROGRAMS = $(TESTS) +check_DATA = table10.dat table2.dat table3.dat tableF32.dat tableS32.dat tableU8.dat + TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified tests: $(TESTS) @@ -27,2 +29,6 @@ tst_psLookupTable_01_SOURCES = tst_psLookupTable_01.c tst_psFits_SOURCES = tst_psFits.c + +%.dat: verified/%.dat + cp $? $@ + Index: trunk/psLib/test/dataIO/table10.dat =================================================================== --- trunk/psLib/test/dataIO/table10.dat (revision 3286) +++ (revision ) @@ -1,14 +1,0 @@ -# Table with valid types and index-values -# -psU8 psU16 psU32 psU64 psS8 psS16 psS32 psS64 psF32 psF64 -6 14 28 256 -6 -14 -28 -256 1.50 13.98 -10 22 44 4096 -10 -22 -44 -4096 4.50 27.30 -1 4 8 16 -1 -4 -8 -16 -2.25 -2.67 -3 8 16 32 -3 -8 -16 -32 -0.75 3.99 -9 20 40 2048 -9 -20 -40 -2048 3.75 23.97 -2 6 12 24 -2 -6 -12 -24 -1.5 0.66 -7 16 32 512 -7 -16 -32 -512 2.250 17.31 -4 10 20 64 -4 -10 -20 -64 0.00 7.32 -5 12 24 128 -5 -12 -24 -128 0.75 10.65 -8 18 36 1024 -8 -18 -36 -1024 3.00 20.64 -# Index: trunk/psLib/test/dataIO/table2.dat =================================================================== --- trunk/psLib/test/dataIO/table2.dat (revision 3286) +++ (revision ) @@ -1,8 +1,0 @@ -# Table with invalid type in the type row but with valid index-values -# -psU8 psU16 psU32 psU64 psXS8 psS16 psS32 psS64 psF32 psF64 -0 2 4 8 0 -2 -4 -8 -0.5 -1.5 -1 4 8 16 -1 -4 -8 -16 0.0 -1.0 -2 6 12 24 -2 -6 -12 -24 0.5 -0.25 -3 8 16 32 -3 -8 -16 -32 0.75 1.75 -# Index: trunk/psLib/test/dataIO/table3.dat =================================================================== --- trunk/psLib/test/dataIO/table3.dat (revision 3286) +++ (revision ) @@ -1,8 +1,0 @@ -# Table with valid types and index-values -# -psU8 psU16 psU32 psU64 psS8 psS16 psS32 psS64 psF32 psF64 -0 2 4 8 0 -2 -4 -8 -0.5 -1.5 -1) 4= 8; 1(6 -1_ -4$ -8@ -16{ 0.0[ -1.0] -2 6 12 24 -2 -6 -12 -24 0.5 -0.25 -3 8 16 32 -3 -8 -16 -32 0.75 1.75 -# Index: trunk/psLib/test/dataIO/tableF32.dat =================================================================== --- trunk/psLib/test/dataIO/tableF32.dat (revision 3286) +++ (revision ) @@ -1,8 +1,0 @@ -# Table with valid types and index-values -# -psF32 psU16 psU32 psU64 psS8 psS16 psS32 psS64 psU8 psF64 --10.05 2 4 8 0 -2 -4 -8 5 -1.5 -1.009 4 8 16 -1 -4 -8 -16 0 -1.0 -23.45 6 12 24 -2 -6 -12 -24 5 -0.25 -3500.67 8 16 32 -3 -8 -16 -32 75 1.75 -# Index: trunk/psLib/test/dataIO/tableS32.dat =================================================================== --- trunk/psLib/test/dataIO/tableS32.dat (revision 3286) +++ (revision ) @@ -1,8 +1,0 @@ -# Table with valid types and index-values -# -psS32 psU16 psU32 psU64 psS8 psS16 psU8 psS64 psF32 psF64 --1 2 4 8 0 -2 99 -8 -0.5 -1.5 -11 4 8 16 -1 -4 100 -16 0.0 -1.0 -22 6 12 24 -2 -6 101 -24 0.5 -0.25 -33 8 16 32 -3 -8 102 -32 0.75 1.75 -# Index: trunk/psLib/test/dataIO/tableU8.dat =================================================================== --- trunk/psLib/test/dataIO/tableU8.dat (revision 3286) +++ (revision ) @@ -1,8 +1,0 @@ -# Table with valid types and index-values -# -psU8 psU16 psU32 psU64 psS8 psS16 psS32 psS64 psF32 psF64 -0 2 4 8 0 -2 -4 -8 -0.5 -1.5 -1 4 8 16 -1 -4 -8 -16 0.0 -1.0 -2 6 12 24 -2 -6 -12 -24 0.5 -0.25 -3 8 16 32 -3 -8 -16 -32 0.75 1.75 -# Index: trunk/psLib/test/dataIO/tst_psFits.c =================================================================== --- trunk/psLib/test/dataIO/tst_psFits.c (revision 3286) +++ trunk/psLib/test/dataIO/tst_psFits.c (revision 3298) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-18 22:17:20 $ +* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-22 19:25:53 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -161,26 +161,16 @@ header = psMetadataAlloc(); - int id = psMemGetId(); psMetadataAdd(header,PS_LIST_TAIL, "MYINT", PS_TYPE_S32, PS_META_PRIMITIVE, "psS32 Item", (psS32)row); - fprintf(stderr,"ref=%d(%d), ",(int)psMemGetRefCounter(header->list->tail->data), id); - - id = psMemGetId(); psMetadataAdd(header,PS_LIST_TAIL, "MYFLT", PS_TYPE_F32, PS_META_PRIMITIVE, "psF32 Item", (float)(1.0f/(float)(1+row))); - fprintf(stderr,"%d(%d), ",(int)psMemGetRefCounter(header->list->tail->data),id); - - id = psMemGetId(); psMetadataAdd(header,PS_LIST_TAIL, "MYDBL", PS_TYPE_F64, PS_META_PRIMITIVE, "psF64 Item", (double)(1.0/(double)(1+row))); - fprintf(stderr,"%d(%d), ",(int)psMemGetRefCounter(header->list->tail->data),id); - - id = psMemGetId(); psMetadataAdd(header,PS_LIST_TAIL, "MYBOOL", PS_TYPE_BOOL, PS_META_PRIMITIVE, @@ -188,6 +178,4 @@ (row%2 == 0)); - fprintf(stderr,"%d(%d)\n",(int)psMemGetRefCounter(header->list->tail->data),id); - table->data[row] = header; } @@ -198,7 +186,5 @@ psFree(fitsFile); - psMemCheckLeaks(15,NULL,stderr,false); - - return true; + return ! psMemCheckLeaks(15,NULL,stderr,false); } Index: trunk/psLib/test/dataIO/verified/table10.dat =================================================================== --- trunk/psLib/test/dataIO/verified/table10.dat (revision 3298) +++ trunk/psLib/test/dataIO/verified/table10.dat (revision 3298) @@ -0,0 +1,14 @@ +# Table with valid types and index-values +# +psU8 psU16 psU32 psU64 psS8 psS16 psS32 psS64 psF32 psF64 +6 14 28 256 -6 -14 -28 -256 1.50 13.98 +10 22 44 4096 -10 -22 -44 -4096 4.50 27.30 +1 4 8 16 -1 -4 -8 -16 -2.25 -2.67 +3 8 16 32 -3 -8 -16 -32 -0.75 3.99 +9 20 40 2048 -9 -20 -40 -2048 3.75 23.97 +2 6 12 24 -2 -6 -12 -24 -1.5 0.66 +7 16 32 512 -7 -16 -32 -512 2.250 17.31 +4 10 20 64 -4 -10 -20 -64 0.00 7.32 +5 12 24 128 -5 -12 -24 -128 0.75 10.65 +8 18 36 1024 -8 -18 -36 -1024 3.00 20.64 +# Index: trunk/psLib/test/dataIO/verified/table2.dat =================================================================== --- trunk/psLib/test/dataIO/verified/table2.dat (revision 3298) +++ trunk/psLib/test/dataIO/verified/table2.dat (revision 3298) @@ -0,0 +1,8 @@ +# Table with invalid type in the type row but with valid index-values +# +psU8 psU16 psU32 psU64 psXS8 psS16 psS32 psS64 psF32 psF64 +0 2 4 8 0 -2 -4 -8 -0.5 -1.5 +1 4 8 16 -1 -4 -8 -16 0.0 -1.0 +2 6 12 24 -2 -6 -12 -24 0.5 -0.25 +3 8 16 32 -3 -8 -16 -32 0.75 1.75 +# Index: trunk/psLib/test/dataIO/verified/table3.dat =================================================================== --- trunk/psLib/test/dataIO/verified/table3.dat (revision 3298) +++ trunk/psLib/test/dataIO/verified/table3.dat (revision 3298) @@ -0,0 +1,8 @@ +# Table with valid types and index-values +# +psU8 psU16 psU32 psU64 psS8 psS16 psS32 psS64 psF32 psF64 +0 2 4 8 0 -2 -4 -8 -0.5 -1.5 +1) 4= 8; 1(6 -1_ -4$ -8@ -16{ 0.0[ -1.0] +2 6 12 24 -2 -6 -12 -24 0.5 -0.25 +3 8 16 32 -3 -8 -16 -32 0.75 1.75 +# Index: trunk/psLib/test/dataIO/verified/tableF32.dat =================================================================== --- trunk/psLib/test/dataIO/verified/tableF32.dat (revision 3298) +++ trunk/psLib/test/dataIO/verified/tableF32.dat (revision 3298) @@ -0,0 +1,8 @@ +# Table with valid types and index-values +# +psF32 psU16 psU32 psU64 psS8 psS16 psS32 psS64 psU8 psF64 +-10.05 2 4 8 0 -2 -4 -8 5 -1.5 +1.009 4 8 16 -1 -4 -8 -16 0 -1.0 +23.45 6 12 24 -2 -6 -12 -24 5 -0.25 +3500.67 8 16 32 -3 -8 -16 -32 75 1.75 +# Index: trunk/psLib/test/dataIO/verified/tableS32.dat =================================================================== --- trunk/psLib/test/dataIO/verified/tableS32.dat (revision 3298) +++ trunk/psLib/test/dataIO/verified/tableS32.dat (revision 3298) @@ -0,0 +1,8 @@ +# Table with valid types and index-values +# +psS32 psU16 psU32 psU64 psS8 psS16 psU8 psS64 psF32 psF64 +-1 2 4 8 0 -2 99 -8 -0.5 -1.5 +11 4 8 16 -1 -4 100 -16 0.0 -1.0 +22 6 12 24 -2 -6 101 -24 0.5 -0.25 +33 8 16 32 -3 -8 102 -32 0.75 1.75 +# Index: trunk/psLib/test/dataIO/verified/tableU8.dat =================================================================== --- trunk/psLib/test/dataIO/verified/tableU8.dat (revision 3298) +++ trunk/psLib/test/dataIO/verified/tableU8.dat (revision 3298) @@ -0,0 +1,8 @@ +# Table with valid types and index-values +# +psU8 psU16 psU32 psU64 psS8 psS16 psS32 psS64 psF32 psF64 +0 2 4 8 0 -2 -4 -8 -0.5 -1.5 +1 4 8 16 -1 -4 -8 -16 0.0 -1.0 +2 6 12 24 -2 -6 -12 -24 0.5 -0.25 +3 8 16 32 -3 -8 -16 -32 0.75 1.75 +#