Changeset 3246 for trunk/psLib/test

Timestamp:

Feb 16, 2005, 3:58:43 PM (21 years ago)

Author:

desonia

Message:

changed the prototype of psMetadataLookup_.

Location:

trunk/psLib/test

Files:

• astronomy/Makefile.am (modified) (4 diffs)
• astronomy/data (added)
• astronomy/data/header_1.fits (added)
• astronomy/data/header_2.fits (added)
• astronomy/data/psTime.config.template (added)
• astronomy/data/test.config (added)
• astronomy/data/test.psTime.config1.template (added)
• astronomy/data/test.psTime.config2.template (added)
• astronomy/data/test.psTime.config3.template (added)
• astronomy/data/test.psTime.config4.template (added)
• astronomy/data/test.ser7.dat (added)
• astronomy/header_1.fits (deleted)
• astronomy/header_2.fits (deleted)
• astronomy/test.config (deleted)
• astronomy/test.psTime.config1.template (deleted)
• astronomy/test.psTime.config2.template (deleted)
• astronomy/test.psTime.config3.template (deleted)
• astronomy/test.psTime.config4.template (deleted)
• astronomy/tst_psAstrometry.c (modified) (2 diffs)
• astronomy/tst_psMetadata_04.c (modified) (7 diffs)
• astronomy/tst_psMetadata_05.c (modified) (3 diffs)
• astronomy/tst_psTime_01.c (modified) (2 diffs)
• astronomy/tst_psTime_03.c (modified) (2 diffs)
• astronomy/tst_psTime_04.c (modified) (6 diffs)
• collections/tst_psMetadata_04.c (modified) (7 diffs)
• collections/tst_psMetadata_05.c (modified) (3 diffs)
• dataIO/tst_psFits.c (modified) (5 diffs)
• fileUtils/tst_psFits.c (modified) (5 diffs)
• image/Makefile.am (modified) (2 diffs)
• image/tst_psImageManip.c (modified) (2 diffs)
• runTest (modified) (4 diffs)
• sysUtils/verified/tst_psMemory.stderr (modified) (6 diffs)

trunk/psLib/test/astronomy/Makefile.am

@@ -13 +13 @@
 AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 AM_CFLAGS = -DXML_CONFIG_FILE="\"$(top_srcdir)/etc/pslib/psTime.xml\""
+  
 
 check_PROGRAMS = tst_psTime_01 \
@@ -30 +31 @@
          tst_psAstrometry01
 
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified
+check_DATA = test.config \
+        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
  
 TESTS = tst_psTime_01 \
@@ -48 +59 @@
          tst_psAstrometry01
 
-tests: $(TESTS) test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4
- 
+tests: $(check_DATA) $(TESTS)
+        
 tst_psTime_01_SOURCES = tst_psTime_01.c
 tst_psTime_02_SOURCES = tst_psTime_02.c
@@ -66 +77 @@
 tst_psAstrometry01_SOURCES = tst_psAstrometry01.c
 
-BUILT_SOURCES = test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4
-CLEANFILES = test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4
+EXTRA_DIST = data/test.psTime.config1.template \
+        data/test.psTime.config2.template \
+        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 
 
-EXTRA_DIST = test.psTime.config1.template \
-        test.psTime.config2.template \
-        test.psTime.config3.template \
-        test.psTime.config4.template \
-        verified \
-        test.ser7.dat \
-        header_1.fits \
-        header_2.fits \
-        test.config
+psTime.config: $(top_srcdir)/etc/pslib/psTime.config.template
+        sed 's|PREFIX|$(top_srcdir)|' $? > $@
 
-test.psTime.config1: test.psTime.config1.template
-        sed 's|PREFIX|$(prefix)|' $? > $@
+test.psTime.config1: data/test.psTime.config1.template
+        cp $? $@
 
-test.psTime.config2: test.psTime.config2.template
-        sed 's|PREFIX|$(prefix)|' $? > $@
+test.psTime.config2: data/test.psTime.config2.template
+        sed 's|PREFIX|$(top_srcdir)|' $? > $@
 
-test.psTime.config3: test.psTime.config3.template
-        sed 's|PREFIX|$(prefix)|' $? > $@
+test.psTime.config3: data/test.psTime.config3.template
+        sed 's|PREFIX|$(top_srcdir)|' $? > $@
 
-test.psTime.config4: test.psTime.config4.template
-        sed 's|PREFIX|$(prefix)|' $? > $@
+test.psTime.config4: data/test.psTime.config4.template
+        sed 's|PREFIX|$(srcdir)|' $? > $@
 
+test.config: data/test.config
+        cp $? $@
+
+header_1.fits: data/header_1.fits
+        cp $? $@
+
+header_2.fits: data/header_2.fits
+        cp $? $@

trunk/psLib/test/astronomy/tst_psAstrometry.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-16 00:22:05 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-17 01:58:43 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -129 +129 @@
 {
     char* name = "The Kaiser Royal Observatory";
+
     psObservatory* obs = psObservatoryAlloc(name,
                                             20.7*M_PI/180.0, 156.3*M_PI/180.0, 3055.0, 9.0);

trunk/psLib/test/astronomy/tst_psMetadata_04.c

@@ -23 +23 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.12 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-02-03 00:54:12 $
+*  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-02-17 01:58:43 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -165 +165 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test G - Lookup metadata item and return psS32 value");
     psS32 valueS32 = 0;
-    valueS32 = psMetadataLookupS32(metadata, "myItem2", &status);
+    valueS32 = psMetadataLookupS32(&status, metadata, "myItem2");
     if(valueS32 != 55) {
         printf("ERROR: Bad value, %d, Expected 55\n", valueS32);
@@ -178 +178 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test H - Lookup metadata item and return psF64 value");
     psF64 valueF64 = 0.0;
-    valueF64 = psMetadataLookupF64(metadata, "myItem5", &status);
+    valueF64 = psMetadataLookupF64(&status, metadata, "myItem5");
     if(fabs(valueF64-3.14) > FLT_EPSILON) {
         printf("ERROR: Bad value, %g, Expected 3.14\n", valueF64);
@@ -191 +191 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test I - Lookup metadata item and return psVector pointer");
     psVector *valueVec = NULL;
-    valueVec = psMetadataLookupPtr(metadata, "myItem6", &status);
+    valueVec = psMetadataLookupPtr(&status, metadata, "myItem6");
     if(valueVec != vec) {
         printf("ERROR: Bad vector pointer\n");
@@ -248 +248 @@
     // Test N - Attempt get psS32 value of non-existant metadata item
     printPositiveTestHeader(stdout, "psMetadata", "Test N - Attempt get psS32 value of non-existant metadata item");
-    valueS32 = psMetadataLookupS32(metadata, "myItem22", &status);
+    valueS32 = psMetadataLookupS32(&status, metadata, "myItem22");
     if(status) {
         printf("ERROR: Bad status, %d, \n", status);
@@ -257 +257 @@
     // Test O - Attempt get psF64 value of non-existant metadata item
     printPositiveTestHeader(stdout, "psMetadata", "Test O - Attempt get psF64 value of non-existant metadata item");
-    valueF64 = psMetadataLookupF64(metadata, "myItem22", &status);
+    valueF64 = psMetadataLookupF64(&status, metadata, "myItem22");
     if(status) {
         printf("ERROR: Bad status, %d, \n", status);
@@ -266 +266 @@
     // Test P - Attempt get psVector value of non-existant metadata item
     printPositiveTestHeader(stdout, "psMetadata", "Test P - Attempt get psVector value of non-existant metadata item");
-    valueVec = psMetadataLookupPtr(metadata, "myItem22", &status);
+    valueVec = psMetadataLookupPtr(&status, metadata, "myItem22");
     if(status) {
         printf("ERROR: Bad status, %d, \n", status);

trunk/psLib/test/astronomy/tst_psMetadata_05.c

@@ -22 +22 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.17 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-02-03 00:54:12 $
+*  @version $Revision: 1.18 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-02-17 01:58:43 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -161 +161 @@
     // Test F - Write metadata item to file
     printPositiveTestHeader(stdout, "psMetadata", "Test F - Write metadata item to file");
-    fd = fopen("./tst_psMetadata05_OUT", "w");
+    fd = fopen("temp/tst_psMetadata05_OUT", "w");
     if(fd == NULL) {
         printf("ERROR: Couldn't open file for writing\n");
@@ -198 +198 @@
     fclose(fd);
 
-    fd = fopen("./tst_psMetadata05_OUT", "r");
+    fd = fopen("temp/tst_psMetadata05_OUT", "r");
     if(fd == NULL) {
         printf("ERROR: Couldn't open file for reading\n");

trunk/psLib/test/astronomy/tst_psTime_01.c

@@ -23 +23 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.18 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-02-03 00:54:12 $
+ *  @version $Revision: 1.19 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-02-17 01:58:43 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -38 +38 @@
     psTime *testTime;
     char *testString = "2004-07-21T18:22:24.272Z";
+
+    psLibInit(true,"psTime.config");
 
     // Test time was taken at July 21, 2004 at 18:22:24.272044

trunk/psLib/test/astronomy/tst_psTime_03.c

@@ -19 +19 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-01-13 01:58:10 $
+ *  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-02-17 01:58:43 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -34 +34 @@
 psS32 main(psS32 argc, char* argv[])
 {
+
+    psLibInit(true,"psTime.config");
 
     // Test A - Add two times

trunk/psLib/test/astronomy/tst_psTime_04.c

@@ -14 +14 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-02-15 03:02:53 $
+ *  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-02-17 01:58:43 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -30 +30 @@
     // Test A - Initialize time
     printPositiveTestHeader(stdout, "psTime", "Test A - Initialize time");
-    psLibInit(true, p_psGetConfigFileName());
+    psLibInit(true, "psTime.config");
     psLibFinalize();
     printFooter(stdout, "psTime", "Test A - Initialize time", true);
@@ -45 +45 @@
     printNegativeTestHeader(stdout,"psTime", "Test C - Attempt to open non-existant time data files",
                             "Failed to open file 'zzz'.  Check if it exists and it has the proper permissions.", 0);
-    psLibInit(true, "./test.psTime.config1");
+    psLibInit(true, "test.psTime.config1");
     psLibFinalize();
     printFooter(stdout, "psTime", "Test C - Attempt to open non-existant time data files", true);
@@ -53 +53 @@
     printNegativeTestHeader(stdout,"psTime", "Test D - Attempt to read incorrect number of files",
                             "Incorrect number of table files entered. Found: 3. Expected: 4.", 0);
-    psLibInit(true, "./test.psTime.config2");
+    psLibInit(true, "test.psTime.config2");
     psLibFinalize();
     printFooter(stdout, "psTime", "Test D - Attempt to read incorrect number of files", true);
@@ -61 +61 @@
     printNegativeTestHeader(stdout,"psTime", "Test E - Attempt to read incorrect number of from values",
                             "Incorrect vector size. Size: 3, Expected 4.", 0);
-    psLibInit(true, "./test.psTime.config3");
+    psLibInit(true, "test.psTime.config3");
     psLibFinalize();
     printFooter(stdout, "psTime", "Test E - Attempt to read incorrect number of from values", true);
@@ -69 +69 @@
     printNegativeTestHeader(stdout,"psTime", "Test F - Attempt to read data file with typo in number",
                             "Unable to parse string, number on line 16.", 0);
-    psLibInit(true, "./test.psTime.config4");
+    psLibInit(true, "test.psTime.config4");
     psLibFinalize();
     printFooter(stdout, "psTime", "Test F - Attempt to read data file with typo in number", true);

trunk/psLib/test/collections/tst_psMetadata_04.c

@@ -23 +23 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.12 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-02-03 00:54:12 $
+*  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-02-17 01:58:43 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -165 +165 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test G - Lookup metadata item and return psS32 value");
     psS32 valueS32 = 0;
-    valueS32 = psMetadataLookupS32(metadata, "myItem2", &status);
+    valueS32 = psMetadataLookupS32(&status, metadata, "myItem2");
     if(valueS32 != 55) {
         printf("ERROR: Bad value, %d, Expected 55\n", valueS32);
@@ -178 +178 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test H - Lookup metadata item and return psF64 value");
     psF64 valueF64 = 0.0;
-    valueF64 = psMetadataLookupF64(metadata, "myItem5", &status);
+    valueF64 = psMetadataLookupF64(&status, metadata, "myItem5");
     if(fabs(valueF64-3.14) > FLT_EPSILON) {
         printf("ERROR: Bad value, %g, Expected 3.14\n", valueF64);
@@ -191 +191 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test I - Lookup metadata item and return psVector pointer");
     psVector *valueVec = NULL;
-    valueVec = psMetadataLookupPtr(metadata, "myItem6", &status);
+    valueVec = psMetadataLookupPtr(&status, metadata, "myItem6");
     if(valueVec != vec) {
         printf("ERROR: Bad vector pointer\n");
@@ -248 +248 @@
     // Test N - Attempt get psS32 value of non-existant metadata item
     printPositiveTestHeader(stdout, "psMetadata", "Test N - Attempt get psS32 value of non-existant metadata item");
-    valueS32 = psMetadataLookupS32(metadata, "myItem22", &status);
+    valueS32 = psMetadataLookupS32(&status, metadata, "myItem22");
     if(status) {
         printf("ERROR: Bad status, %d, \n", status);
@@ -257 +257 @@
     // Test O - Attempt get psF64 value of non-existant metadata item
     printPositiveTestHeader(stdout, "psMetadata", "Test O - Attempt get psF64 value of non-existant metadata item");
-    valueF64 = psMetadataLookupF64(metadata, "myItem22", &status);
+    valueF64 = psMetadataLookupF64(&status, metadata, "myItem22");
     if(status) {
         printf("ERROR: Bad status, %d, \n", status);
@@ -266 +266 @@
     // Test P - Attempt get psVector value of non-existant metadata item
     printPositiveTestHeader(stdout, "psMetadata", "Test P - Attempt get psVector value of non-existant metadata item");
-    valueVec = psMetadataLookupPtr(metadata, "myItem22", &status);
+    valueVec = psMetadataLookupPtr(&status, metadata, "myItem22");
     if(status) {
         printf("ERROR: Bad status, %d, \n", status);

trunk/psLib/test/collections/tst_psMetadata_05.c

@@ -22 +22 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.17 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-02-03 00:54:12 $
+*  @version $Revision: 1.18 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-02-17 01:58:43 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -161 +161 @@
     // Test F - Write metadata item to file
     printPositiveTestHeader(stdout, "psMetadata", "Test F - Write metadata item to file");
-    fd = fopen("./tst_psMetadata05_OUT", "w");
+    fd = fopen("temp/tst_psMetadata05_OUT", "w");
     if(fd == NULL) {
         printf("ERROR: Couldn't open file for writing\n");
@@ -198 +198 @@
     fclose(fd);
 
-    fd = fopen("./tst_psMetadata05_OUT", "r");
+    fd = fopen("temp/tst_psMetadata05_OUT", "r");
     if(fd == NULL) {
         printf("ERROR: Couldn't open file for reading\n");

trunk/psLib/test/dataIO/tst_psFits.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-03 00:54:12 $
+*  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-02-17 01:58:43 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -623 +623 @@
 
         // check for the extra metadata items
-        psS32 intItem = psMetadataLookupS32(header, "MYINT",NULL);
-        psF32 fltItem = psMetadataLookupF32(header, "MYFLT",NULL);
-        psF64 dblItem = psMetadataLookupF64(header, "MYDBL",NULL);
+        psS32 intItem = psMetadataLookupS32(NULL,header, "MYINT");
+        psF32 fltItem = psMetadataLookupF32(NULL,header, "MYFLT");
+        psF64 dblItem = psMetadataLookupF64(NULL,header, "MYDBL");
         psMetadataItem* boolItem = psMetadataLookup(header, "MYBOOL");
-        char* strItem = psMetadataLookupPtr(header, "MYSTR",NULL);
+        char* strItem = psMetadataLookupPtr(NULL, header, "MYSTR");
 
         if (intItem != hdunum) {
@@ -739 +739 @@
         }
 
-        psS32 intItem = psMetadataLookupS32(header, "MYINT",NULL);
+        psS32 intItem = psMetadataLookupS32(NULL, header, "MYINT");
 
         if (intItem != i) {
@@ -783 +783 @@
         }
 
-        psS32 intItem = psMetadataLookupS32(header, "MYINT",NULL);
+        psS32 intItem = psMetadataLookupS32(NULL, header, "MYINT");
 
         if (intItem != i) {
@@ -842 +842 @@
         psMetadata* rowData = table->data[row];
 
-        psS32 intItem = psMetadataLookupS32(rowData, "MYINT",NULL);
-        psF32 fltItem = psMetadataLookupF32(rowData, "MYFLT",NULL);
-        psF64 dblItem = psMetadataLookupF64(rowData, "MYDBL",NULL);
-        psBool boolItem = psMetadataLookupBool(rowData, "MYBOOL",NULL);
+        psS32 intItem = psMetadataLookupS32(NULL, rowData, "MYINT");
+        psF32 fltItem = psMetadataLookupF32(NULL, rowData, "MYFLT");
+        psF64 dblItem = psMetadataLookupF64(NULL, rowData, "MYDBL");
+        psBool boolItem = psMetadataLookupBool(NULL, rowData, "MYBOOL");
 
         if (intItem != row) {

trunk/psLib/test/fileUtils/tst_psFits.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-03 00:54:12 $
+*  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-02-17 01:58:43 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -623 +623 @@
 
         // check for the extra metadata items
-        psS32 intItem = psMetadataLookupS32(header, "MYINT",NULL);
-        psF32 fltItem = psMetadataLookupF32(header, "MYFLT",NULL);
-        psF64 dblItem = psMetadataLookupF64(header, "MYDBL",NULL);
+        psS32 intItem = psMetadataLookupS32(NULL,header, "MYINT");
+        psF32 fltItem = psMetadataLookupF32(NULL,header, "MYFLT");
+        psF64 dblItem = psMetadataLookupF64(NULL,header, "MYDBL");
         psMetadataItem* boolItem = psMetadataLookup(header, "MYBOOL");
-        char* strItem = psMetadataLookupPtr(header, "MYSTR",NULL);
+        char* strItem = psMetadataLookupPtr(NULL, header, "MYSTR");
 
         if (intItem != hdunum) {
@@ -739 +739 @@
         }
 
-        psS32 intItem = psMetadataLookupS32(header, "MYINT",NULL);
+        psS32 intItem = psMetadataLookupS32(NULL, header, "MYINT");
 
         if (intItem != i) {
@@ -783 +783 @@
         }
 
-        psS32 intItem = psMetadataLookupS32(header, "MYINT",NULL);
+        psS32 intItem = psMetadataLookupS32(NULL, header, "MYINT");
 
         if (intItem != i) {
@@ -842 +842 @@
         psMetadata* rowData = table->data[row];
 
-        psS32 intItem = psMetadataLookupS32(rowData, "MYINT",NULL);
-        psF32 fltItem = psMetadataLookupF32(rowData, "MYFLT",NULL);
-        psF64 dblItem = psMetadataLookupF64(rowData, "MYDBL",NULL);
-        psBool boolItem = psMetadataLookupBool(rowData, "MYBOOL",NULL);
+        psS32 intItem = psMetadataLookupS32(NULL, rowData, "MYINT");
+        psF32 fltItem = psMetadataLookupF32(NULL, rowData, "MYFLT");
+        psF64 dblItem = psMetadataLookupF64(NULL, rowData, "MYDBL");
+        psBool boolItem = psMetadataLookupBool(NULL, rowData, "MYBOOL");
 
         if (intItem != row) {

trunk/psLib/test/image/Makefile.am

@@ -29 +29 @@
         tst_psImageInterpolate
 
+check_DATA = \
+        fBiOut.fits \
+        fOut.fits \
+        sBiOut.fits \
+        sOut.fits
+               
 TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified 
 TESTS = \
@@ -57 +63 @@
 tst_psImageIO_SOURCES =  tst_psImageIO.c
 tst_psImageInterpolate_SOURCES =  tst_psImageInterpolate.c
+
+fBiOut.fits: verified/fBiOut.fits
+        cp $? $@
+
+fOut.fits: verified/fOut.fits
+        cp $? $@
+
+sBiOut.fits: verified/sBiOut.fits
+        cp $? $@
+
+sOut.fits: verified/sOut.fits
+        cp $? $@
+                        

trunk/psLib/test/image/tst_psImageManip.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-18 03:15:04 $
+ *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-17 01:58:43 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1356 +1356 @@
 
         // now, let's compare this with the verified file
-        fTruth = psImageReadSection(fTruth,0,0,0,0,0,NULL,index,"verified/fOut.fits");
-        sTruth = psImageReadSection(sTruth,0,0,0,0,0,NULL,index,"verified/sOut.fits");
-        fBiTruth = psImageReadSection(fBiTruth,0,0,0,0,0,NULL,index,"verified/fBiOut.fits");
-        sBiTruth = psImageReadSection(sBiTruth,0,0,0,0,0,NULL,index,"verified/sBiOut.fits");
+        fTruth = psImageReadSection(fTruth,0,0,0,0,0,NULL,index,"fOut.fits");
+        sTruth = psImageReadSection(sTruth,0,0,0,0,0,NULL,index,"sOut.fits");
+        fBiTruth = psImageReadSection(fBiTruth,0,0,0,0,0,NULL,index,"fBiOut.fits");
+        sBiTruth = psImageReadSection(sBiTruth,0,0,0,0,0,NULL,index,"sBiOut.fits");
         if (fTruth == NULL) {
             psError(PS_ERR_UNKNOWN, true,"verified psF32 image failed to be read (%d deg. rotation)",

trunk/psLib/test/runTest

@@ -26 +26 @@
 #
 #  $Revison:  $  $Name: not supported by cvs2svn $
-#  $Date: 2005-02-15 19:53:19 $
+#  $Date: 2005-02-17 01:58:42 $
 #
 #  Copyright 2004 Maui High Performance Computering Center, University of Hawaii
@@ -119 +119 @@
             $exitValue |= 64;
         }
-        else {
-
-            # Test driver succeeded.
-
-            # Create filtered version of stdout and stderr
-
-            # Open the STDOUT file for reading
-            open( OUTFILE, "< temp/$testFile.stdout" );
-
-            # Open mod file to place filtered STDOUT
-            open( MODFILE,  "> temp/$testFile.stdout.mod" );
-            open( MODFILE2, "> $verifiedDir/$testFile.stdout" ) if $resetStdout;
-
-           # Replace the variable date, time and host information with constants
-            $hostname = `hostname`;
-            chop $hostname;
-            while (<OUTFILE>) {
-                s/\s+\d+:\d+:\d+\w/<TIME>/g;
-                s/\d+:\d+:\d+/<DATE>/g;
-                s/$hostname\s*/<HOST>/g;
-                s/: Line \d+/: Line <LINENO>/g;
-                s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
-                s/allocate \d+ bytes at/allocate <N> bytes at/g;
-
-              # Filter lines with malloc.  This is an artifact of memory testing
-              # with the Mac testbed
-                if ( !m/\*\*\*\smalloc/ ) {
-                    print MODFILE ($_);
-                    print MODFILE2 ($_) if $resetStdout;
-                }
-            }
-
-            # Close mod file
-            close(MODFILE);
-            close(MODFILE2) if $resetStdout;
-
-            # Close STDERR file
-            close(OUTFILE);
-
-            # Open the STDERR file for reading
-            open( OUTFILE, "< temp/$testFile.stderr" );
-
-            # Open mod file to place filtered STDERR
-            open( MODFILE,  "> temp/$testFile.stderr.mod" );
-            open( MODFILE2, "> $verifiedDir/$testFile.stderr" ) if $resetStderr;
-
-           # Replace the variable date, time and host information with constants
-            while (<OUTFILE>) {
-                s/\s+\d+:\d+:\d+\w/<TIME>/g;
-                s/\d+:\d+:\d+/<DATE>/g;
-                s/$hostname\s*/<HOST>/g;
-                s/: Line \d+/: Line <LINENO>/g;
-                s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
-                s/allocate \d+ bytes at/allocate <N> bytes at/g;
-
-              # Filter lines with malloc.  This is an artifact of memory testing
-              # with the Mac testbed
-                if ( !m/\*\*\*\smalloc/ ) {
-                    print MODFILE ($_);
-                    print MODFILE2 ($_) if $resetStderr;
-                }
-            }
-
-            # Close mod file
-            close(MODFILE);
-            close(MODFILE2) if $resetStderr;
-
-            # Close STDERR file
-            close(OUTFILE);
-
-            # Compare STDOUT capture with verified file
-            $exitValue |= &compareStream("$verifiedDir/$testFile.stdout");
-
-            # Check exit value to determine if verified file doesn't exist
-            if ( $exitValue & 2 ) {
-
-                # STDOUT verified doesn't exist.  Search STDOUT capture
-                # for strings indicating error or failure
-                $exitValue |= &errorStrSearch("$testFile.stdout");
-            }
-
-            # Compare STDERR capture with verified file
-            $exitValue |= &compareStream("$verifiedDir/$testFile.stderr");
-
-            # Check exit value to determine if verified file doesn't exist
-            if ( $exitValue & 4 ) {
-
-                # STDERR verified doesn't exist.  Search STDERR capture
-                # for strings indicating error or failure
-                $exitValue |= &errorStrSearch("$testFile.stderr");
-            }
-        }
-    }
+
+        # Test driver succeeded.
+
+        # Create filtered version of stdout and stderr
+
+        # Open the STDOUT file for reading
+        open( OUTFILE, "< temp/$testFile.stdout" );
+
+        # Open mod file to place filtered STDOUT
+        open( MODFILE,  "> temp/$testFile.stdout.mod" );
+        open( MODFILE2, "> $verifiedDir/$testFile.stdout" ) if $resetStdout;
+
+        # Replace the variable date, time and host information with constants
+        $hostname = `hostname`;
+        chop $hostname;
+        while (<OUTFILE>) {
+            s/\s+\d+:\d+:\d+\w/<TIME>/g;
+            s/\d+:\d+:\d+/<DATE>/g;
+            s/$hostname\s*/<HOST>/g;
+            s/: Line \d+/: Line <LINENO>/g;
+            s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
+            s/\s+[\_\-\/\.\w]+\:\d+/ FILE\:LINENO/g;
+            s/allocate \d+ bytes at/allocate <N> bytes at/g;
+
+            # Filter lines with malloc.  This is an artifact of memory testing
+            # with the Mac testbed
+            if ( !m/\*\*\*\smalloc/ ) {
+                print MODFILE ($_);
+                print MODFILE2 ($_) if $resetStdout;
+            }
+        }
+
+        # Close mod file
+        close(MODFILE);
+        close(MODFILE2) if $resetStdout;
+
+        # Close STDERR file
+        close(OUTFILE);
+
+        # Open the STDERR file for reading
+        open( OUTFILE, "< temp/$testFile.stderr" );
+
+        # Open mod file to place filtered STDERR
+        open( MODFILE,  "> temp/$testFile.stderr.mod" );
+        open( MODFILE2, "> $verifiedDir/$testFile.stderr" ) if $resetStderr;
+
+        # Replace the variable date, time and host information with constants
+        while (<OUTFILE>) {
+            s/\s+\d+:\d+:\d+\w/<TIME>/g;
+            s/\d+:\d+:\d+/<DATE>/g;
+            s/$hostname\s*/<HOST>/g;
+            s/: Line \d+/: Line <LINENO>/g;
+            s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
+            s/\s+[\_\-\/\.\w]+\:\d+/ FILE\:LINENO/g;
+            s/allocate \d+ bytes at/allocate <N> bytes at/g;
+
+            # Filter lines with malloc.  This is an artifact of memory testing
+            # with the Mac testbed
+            if ( !m/\*\*\*\smalloc/ ) {
+                print MODFILE ($_);
+                print MODFILE2 ($_) if $resetStderr;
+            }
+        }
+
+        # Close mod file
+        close(MODFILE);
+        close(MODFILE2) if $resetStderr;
+
+        # Close STDERR file
+        close(OUTFILE);
+
+        # Compare STDOUT capture with verified file
+        $exitValue |= &compareStream("$verifiedDir/$testFile.stdout");
+
+        # Check exit value to determine if verified file doesn't exist
+        if ( $exitValue & 2 ) {
+
+            # STDOUT verified doesn't exist.  Search STDOUT capture
+            # for strings indicating error or failure
+            $exitValue |= &errorStrSearch("$testFile.stdout");
+        }
+
+        # Compare STDERR capture with verified file
+        $exitValue |= &compareStream("$verifiedDir/$testFile.stderr");
+
+        # Check exit value to determine if verified file doesn't exist
+        if ( $exitValue & 4 ) {
+
+            # STDERR verified doesn't exist.  Search STDERR capture
+            # for strings indicating error or failure
+            $exitValue |= &errorStrSearch("$testFile.stderr");
+        }
+   }
     else {
 
@@ -303 +303 @@
 #
 #      Return:   0  -  Compare successful
-#                2  -  STDOUT verified file doesn't exist
-#                4  -  STDERR verified file doesn't exist
 #                8  -  STDOUT verified file doesn't compare
 #               16  -  STDERR verified file doesn't compare
@@ -316 +314 @@
 
     # Check for existence of verified STD stream files
-    if ( !( -e $streamFile ) ) {
-
-        # Display message to user that verified STDOUT file doesn't exist
-        print("        File $streamFile doesn't exist.\n");
-    }
-    else {
+    if ( -e $streamFile ) {
 
         # Verified STD stream file exists

trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr

@@ -21 +21 @@
     Custom MemExhaustedCallback was invoked.
 <DATE><TIME>|<HOST>|A|p_psAlloc
-    Failed to allocate <N> bytes at tst_psMemory.c:206
+    Failed to allocate <N> bytes at FILE:LINENO
 
 ---> TESTPOINT PASSED (psMemory{outOfMemory} | tst_psMemory.c)
@@ -36 +36 @@
     Custom MemExhaustedCallback was invoked.
 <DATE><TIME>|<HOST>|A|p_psRealloc
-    Failed to reallocate <N> bytes at tst_psMemory.c:171
+    Failed to reallocate <N> bytes at FILE:LINENO
 
 ---> TESTPOINT PASSED (psMemory{reallocOutOfMemory} | tst_psMemory.c)
@@ -91 +91 @@
     following psMemCheckLeaks call should produce one instance.
                    file:line ID
-         tst_psMemory.c:356  1
+ FILE:LINENO  1
 <DATE><TIME>|<HOST>|I|TPcheckLeaks
     Testing psMemCheckLeaks again with a different leak location
@@ -97 +97 @@
     following psMemCheckLeaks call should produce one error.
                    file:line ID
-         tst_psMemory.c:386  11
+ FILE:LINENO  11
 <DATE><TIME>|<HOST>|I|TPcheckLeaks
     Testing psMemCheckLeaks again with multiple leak locations.
@@ -103 +103 @@
     following psMemCheckLeaks call should produce two errors.
                    file:line ID
-         tst_psMemory.c:414  16
-         tst_psMemory.c:414  14
+ FILE:LINENO  16
+ FILE:LINENO  14
 
 ---> TESTPOINT PASSED (psMemory{checkLeaks} | tst_psMemory.c)
@@ -147 +147 @@
     Next should abort due to multiple freeing.
 <DATE><TIME>|<HOST>|A|p_psFree
-    Block 1, allocated at tst_psMemory.c:526, freed multiple times at tst_psMemory.c:531.
+    Block 1, allocated at FILE:LINENO, freed multiple times at FILE:LINENO.
 
 ---> TESTPOINT PASSED (psMemory{multipleFree} | tst_psMemory.c)