Changeset 5303

Timestamp:

Oct 12, 2005, 2:38:58 PM (21 years ago)

Author:

desonia

Message:

changes to allow build outside of source area.

Location:

trunk/psLib/test

Files:

• imageops/Makefile.am (modified) (1 diff)
• imageops/tst_psImageGeomManip.c (modified) (4 diffs)
• types/Makefile.am (modified) (1 diff)
• types/tst_psLookupTable_01.c (modified) (9 diffs)
• types/verified/tst_psLookupTable_01.stderr (modified) (1 diff)

trunk/psLib/test/imageops/Makefile.am

@@ -1 +1 @@
 #Makefile for imageops tests of psLib
 #
-AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
+AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) -DVERIFIED_DIR=\"$(srcdir)/verified\"
 AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 

trunk/psLib/test/imageops/tst_psImageGeomManip.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-15 21:22:22 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-10-13 00:38:53 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -496 +496 @@
 
     The following steps of the testpoint are done manually via inspection of
-    temp/fOut.fits & temp/sOut.fits.
+    fOut.fits & sOut.fits.
 
         * Verify the returned psImage structure contains expected values, if
@@ -538 +538 @@
     mkdir("temp",0777);
     remove
-        ("temp/out.fits");
+        ("fOut.fits");
+    remove
+        ("sOut.fits");
+    remove
+        ("fBiOut.fits");
+    remove
+        ("sBiOut.fits");
     psS32 index = 0;
     psBool fail = false;
     psF32 radianRot;
 
-    psFits* fOutFile = psFitsAlloc("temp/fOut.fits");
-    psFits* sOutFile = psFitsAlloc("temp/sOut.fits");
-    psFits* fBiOutFile = psFitsAlloc("temp/fBiOut.fits");
-    psFits* sBiOutFile = psFitsAlloc("temp/sBiOut.fits");
+    psFits* fOutFile = psFitsAlloc("fOut.fits");
+    psFits* sOutFile = psFitsAlloc("sOut.fits");
+    psFits* fBiOutFile = psFitsAlloc("fBiOut.fits");
+    psFits* sBiOutFile = psFitsAlloc("sBiOut.fits");
     if (fOutFile == NULL ||sOutFile == NULL || fBiOutFile == NULL || sBiOutFile == NULL) {
         psError(PS_ERR_UNKNOWN, true, "Can not create output files, so why continue!?");
@@ -552 +558 @@
     }
 
-    psFits* fTruthFile = psFitsAlloc("verified/fOut.fits");
-    psFits* sTruthFile = psFitsAlloc("verified/sOut.fits");
-    psFits* fBiTruthFile = psFitsAlloc("verified/fBiOut.fits");
-    psFits* sBiTruthFile = psFitsAlloc("verified/sBiOut.fits");
+    psFits* fTruthFile = psFitsAlloc(VERIFIED_DIR "/fOut.fits");
+    psFits* sTruthFile = psFitsAlloc(VERIFIED_DIR "/sOut.fits");
+    psFits* fBiTruthFile = psFitsAlloc(VERIFIED_DIR "/fBiOut.fits");
+    psFits* sBiTruthFile = psFitsAlloc(VERIFIED_DIR "/sBiOut.fits");
     if (fTruthFile == NULL ||sTruthFile == NULL || fBiTruthFile == NULL || sBiTruthFile == NULL) {
         psError(PS_ERR_UNKNOWN, true, "Can not open truth files, so why continue!?");

trunk/psLib/test/types/Makefile.am

@@ -1 +1 @@
 #Makefile for types tests
 #
-AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
+AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) -DVERIFIED_DIR=\"$(srcdir)/verified\"
 AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 AM_CFLAGS = -DXML_CONFIG_FILE="\"$(top_srcdir)/etc/pslib/psTime.xml\""
+
 
 TESTS = \

trunk/psLib/test/types/tst_psLookupTable_01.c

@@ -12 +12 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-07-13 02:47:01 $
+*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-10-13 00:38:56 $
 *
 *  Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii
@@ -35 +35 @@
 const psS32 tableU8_size = 4;
 const char tableU8_format[] = "\%d \%d \%d \%ld \%d \%d \%d \%ld \%f \%lf";
-const char tableU8_filename[] = "verified/tableU8.dat";
+const char tableU8_filename[] = VERIFIED_DIR "/tableU8.dat";
 const psS32 tableU8_indexCol = 0;
 const psS32 tableU8_index[] =
@@ -82 +82 @@
 const psS32 tableF32_size = 4;
 const psS32 tableF32_cols = 9;
-const char tableF32_filename[] = "verified/tableF32.dat";
+const char tableF32_filename[] = VERIFIED_DIR "/tableF32.dat";
 const char tableF32_format[] = "\%f \%d \%d \%ld \%d \%d \%d \%ld \%d \%lf";
 const char tableF32_indexCol = 0;
@@ -133 +133 @@
 const psS32 table10_size      = 10;
 const char table10_format[] = "\%d \%d \%d \%ld \%d \%d \%d \%ld \%f \%lf";
-const char table10_filename[] = "verified/table10.dat";
+const char table10_filename[] = VERIFIED_DIR "/table10.dat";
 const psS32 table10_indexCol = 0;
 const psS32  table10_index[]   =
@@ -257 +257 @@
 
     // Read file and place into an array of vectors
-    out = psVectorsReadFromFile("verified/tableF32.dat","\%f \%d \%d \%ld \%d \%d \%d \%ld \%*d \%lf");
+    out = psVectorsReadFromFile(VERIFIED_DIR "/tableF32.dat","\%f \%d \%d \%ld \%d \%d \%d \%ld \%*d \%lf");
     if(out == NULL) {
         psError(PS_ERR_UNKNOWN,true,"Unable to read file into array of vectors");
@@ -371 +371 @@
     // Attempt to read vectors from valid file with invalid format
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for NULL format");
-    out = psVectorsReadFromFile("verified/tableF32.dat",NULL);
+    out = psVectorsReadFromFile(VERIFIED_DIR "/tableF32.dat",NULL);
     if(out != NULL) {
         psError(PS_ERR_UNKNOWN,true,"Did not return NULL with NULL format string");
@@ -387 +387 @@
     // Attempt to read vectors from valid file with invalid format specifiers
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for invalid format specifier");
-    out = psVectorsReadFromFile("verified/tableF32.data","\%f \%c \%d");
+    out = psVectorsReadFromFile(VERIFIED_DIR "/tableF32.data","\%f \%c \%d");
     if(out != NULL) {
         psError(PS_ERR_UNKNOWN,true,"Did not return NULL with invalid format specifier");
@@ -395 +395 @@
     // Attempt to read vectors from non-existant file
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for non-existant file");
-    out = psVectorsReadFromFile("verified/nonexistant.dat","\%f \%d \%d");
+    out = psVectorsReadFromFile("nonexistant.dat","\%f \%d \%d");
     if(out != NULL) {
         psError(PS_ERR_UNKNOWN,true,"Did not return NULL with non-existant file");
@@ -403 +403 @@
     // Attempt to read vectors from file with errors in the numbers
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for error is file");
-    out = psVectorsReadFromFile("verified/tableF32_err.dat","\%f \%d \%d \%ld \%d \%d \%d \%ld \%d \%lf");
+    out = psVectorsReadFromFile(VERIFIED_DIR "/tableF32_err.dat","\%f \%d \%d \%ld \%d \%d \%d \%ld \%d \%lf");
     if(out != NULL) {
         psError(PS_ERR_UNKNOWN,true,"Did not return NULL with file with errors");

trunk/psLib/test/types/verified/tst_psLookupTable_01.stderr

@@ -39 +39 @@
     Following should generate error message for non-existant file
 <DATE><TIME>|<HOST>|E|psVectorsReadFromFile (FILE:LINENO)
-    Failed to open file verified/nonexistant.dat.
+    Failed to open file nonexistant.dat.
 <DATE><TIME>|<HOST>|I|testVectorsReadFromFile
     Following should generate error message for error is file