Changeset 2151

Timestamp:

Oct 15, 2004, 9:10:51 AM (22 years ago)

Author:

desonia

Message:

fixed code so that tests were relocatable.

Location:

trunk/psLib

Files:

• src/Makefile.Globals (modified) (2 diffs)
• src/astro/psTime.c (modified) (3 diffs)
• src/astronomy/Makefile (modified) (1 diff)
• src/astronomy/psTime.c (modified) (3 diffs)
• test/astronomy/Makefile (modified) (2 diffs)
• test/astronomy/tst_psMetadata_01.c (modified) (2 diffs)
• test/collections/tst_psMetadata_01.c (modified) (2 diffs)
• test/image/Makefile (modified) (2 diffs)

trunk/psLib/src/Makefile.Globals

@@ -5 +5 @@
 ##  Assumptions:    Variable "prefix" already defined
 ##
-##  $Revision: 1.19 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-09-16 01:41:51 $
+##  $Revision: 1.20 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-10-15 19:10:50 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -38 +38 @@
 ifndef libexecdir
     export libexecdir = $(prefix)/lib
+endif
+
+ifndef SER7_FILE
+    export SER7_FILE = $(prefix)/data/ser7.dat
+endif
+
+ifndef TAIUTC_FILE
+    export TAIUTC_FILE = $(prefix)/data/tai-utc.dat
 endif
 

trunk/psLib/src/astro/psTime.c

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-14 03:02:30 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-15 19:10:50 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28 +28 @@
 #include "psImage.h"
 #include "psCoord.h"
+#include "psString.h"
 
 #include "psAstronomyErrors.h"
@@ -33 +34 @@
 #ifndef SER7_FILE
 #define SER7_FILE "../../data/ser7.dat"
+#pragma warning SER7_FILE was not defined in the makefile.
 #endif
 
 #ifndef TAIUTC_FILE
 #define TAIUTC_FILE "../../data/tai-utc.dat"
+#pragma warning TAIUTC_FILE was not defined in the makefile.
 #endif
 

trunk/psLib/src/astronomy/Makefile

@@ -5 +5 @@
 TARGET_STATIC  = libpslib.a
 include ../Makefile.Globals
-CFLAGS := $(CFLAGS_RELOC) -I. -I../sysUtils -I../collections -I../dataManip -I.. -I../image
+CFLAGS := $(CFLAGS_RELOC) -I. -I../sysUtils -I../collections -I../dataManip \
+    -I.. -I../image -DSER7_FILE="\"$(SER7_FILE)\"" -DTAIUTC_FILE="\"$(TAIUTC_FILE)\""
 
 SRC_OBJS = psTime.o \

trunk/psLib/src/astronomy/psTime.c

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-14 03:02:30 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-15 19:10:50 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28 +28 @@
 #include "psImage.h"
 #include "psCoord.h"
+#include "psString.h"
 
 #include "psAstronomyErrors.h"
@@ -33 +34 @@
 #ifndef SER7_FILE
 #define SER7_FILE "../../data/ser7.dat"
+#pragma warning SER7_FILE was not defined in the makefile.
 #endif
 
 #ifndef TAIUTC_FILE
 #define TAIUTC_FILE "../../data/tai-utc.dat"
+#pragma warning TAIUTC_FILE was not defined in the makefile.
 #endif
 

trunk/psLib/test/astronomy/Makefile

@@ -3 +3 @@
 ##  Makefile:   test/astronomy
 ##
-##  $Revision: 1.19 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-10-14 02:05:00 $
+##  $Revision: 1.20 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-10-15 19:10:51 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -44 +44 @@
 
 install: $(testbindir) $(testbindir)/verified $(TARGET)
-        install $(TARGET) $(testbindir)
+        install test.config header_1.fits header_2.fits $(TARGET) $(testbindir)
         install verified/*.stderr verified/*.stdout $(testbindir)/verified
 

trunk/psLib/test/astronomy/tst_psMetadata_01.c

@@ -17 +17 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-07 02:01:44 $
+*  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-15 19:10:51 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -134 +134 @@
     */
     printPositiveTestHeader(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file");
-    metadata1 = psMetadataReadHeader(metadata1, NULL, 1, "header_1.fits");
+    metadata1 = psMetadataReadHeader(metadata1, NULL, 1, "verified/header_1.fits");
     printMetadata(metadata1);
     printFooter(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file", true);

trunk/psLib/test/collections/tst_psMetadata_01.c

@@ -17 +17 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-07 02:01:44 $
+*  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-15 19:10:51 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -134 +134 @@
     */
     printPositiveTestHeader(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file");
-    metadata1 = psMetadataReadHeader(metadata1, NULL, 1, "header_1.fits");
+    metadata1 = psMetadataReadHeader(metadata1, NULL, 1, "verified/header_1.fits");
     printMetadata(metadata1);
     printFooter(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file", true);

trunk/psLib/test/image/Makefile

@@ -3 +3 @@
 ##  Makefile:   test/collections
 ##
-##  $Revision: 1.4 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-10-04 23:51:54 $
+##  $Revision: 1.5 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-10-15 19:10:51 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -43 +43 @@
 install: $(testbindir) $(testbindir)/verified $(TARGET)
         install $(TARGET) $(testbindir)
-        install verified/*.stderr verified/*.stdout $(testbindir)/verified
+        install verified/*.fits verified/*.stderr verified/*.stdout $(testbindir)/verified
 
 $(testbindir):