IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 3127


Ignore:
Timestamp:
Feb 4, 2005, 12:49:39 PM (21 years ago)
Author:
desonia
Message:

general autoconf cleanup.

Location:
trunk/psLib
Files:
2 added
1 deleted
78 edited

Legend:

Unmodified
Added
Removed
  • trunk/psLib

    • Property svn:ignore
      •  

        old new  
         1DoxygenLog
        12bin
        23lib
  • trunk/psLib/.cvsignore

    r3125 r3127  
     1DoxygenLog
    12bin
    23lib
  • trunk/psLib/Makefile.am

    r3123 r3127  
    66pkgconfig_DATA= pslib.pc
    77
    8 EXTRA_DIST = pslib-config.in pslib.pc.in
     8EXTRA_DIST = Doxyfile pslib-config.in pslib.pc.in
     9
     10docs:
     11        $(DOXYGEN)
  • trunk/psLib/configure.in

    r3123 r3127  
    11AC_INIT([pslib],[1.5])
    22AM_CONFIG_HEADER(src/config.h)
    3 AM_INIT_AUTOMAKE(pslib, 1.5)
     3AM_INIT_AUTOMAKE(pslib, 1.4)
    44
    55PSLIB_LT_VERSION="0:0:0"
     
    125125AC_CHECK_LIB(mx,sqrtf)
    126126
     127DOXYGEN="doxygen Doxyfile"
     128AC_CHECK_PROG(DOXYGEN,doxygen,[echo Doxygen not detected in configure stage.])
     129AC_SUBST(DOXYGEN,$DOXYGEN)
     130
    127131dnl ---------------- export variables --------------------
    128132
  • trunk/psLib/src/Makefile.am

    r3123 r3127  
    2323libpslib_la_LDFLAGS = -version-info $(PSLIB_LT_VERSION)
    2424
    25 EXTRA_DIST = parseErrorCodes.pl mainpage.dox Doxyfile psErrorCodes.dat psTest.h
     25EXTRA_DIST = parseErrorCodes.pl mainpage.dox psErrorCodes.dat psTest.h
    2626
    2727pslibincludedir = $(includedir)
  • trunk/psLib/src/astronomy/Makefile.am

    r3122 r3127  
    2222BUILT_SOURCES = psAstronomyErrors.h
    2323
    24 EXTRA_DIST = psAstronomyErrors.dat psAstronomyErrors.h
     24EXTRA_DIST = psAstronomyErrors.dat psAstronomyErrors.h astronomy.i
    2525
    2626psAstronomyErrors.h: psAstronomyErrors.dat
  • trunk/psLib/src/collections/Makefile.am

    r3122 r3127  
    2121
    2222BUILT_SOURCES = psCollectionsErrors.h
    23 EXTRA_DIST = psCollectionsErrors.dat psCollectionsErrors.h
     23EXTRA_DIST = psCollectionsErrors.dat psCollectionsErrors.h collections.i
    2424
    2525psCollectionsErrors.h:psCollectionsErrors.dat
  • trunk/psLib/src/dataIO/Makefile.am

    r3122 r3127  
    1616
    1717BUILT_SOURCES = psFileUtilsErrors.h
    18 EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h
     18EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h fileUtils.i
    1919
    2020psFileUtilsErrors.h: psFileUtilsErrors.dat
  • trunk/psLib/src/dataManip/Makefile.am

    r3122 r3127  
    2121           
    2222BUILT_SOURCES = psDataManipErrors.h
    23 EXTRA_DIST = psDataManipErrors.dat psDataManipErrors.h
     23EXTRA_DIST = psDataManipErrors.dat psDataManipErrors.h dataManip.i
    2424
    2525psDataManipErrors.h: psDataManipErrors.dat
  • trunk/psLib/src/fileUtils/Makefile.am

    r3122 r3127  
    1616
    1717BUILT_SOURCES = psFileUtilsErrors.h
    18 EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h
     18EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h fileUtils.i
    1919
    2020psFileUtilsErrors.h: psFileUtilsErrors.dat
  • trunk/psLib/src/image/Makefile.am

    r3122 r3127  
    2121
    2222BUILT_SOURCES = psImageErrors.h
    23 EXTRA_DIST = psImageErrors.dat psImageErrors.h
     23EXTRA_DIST = psImageErrors.dat psImageErrors.h image.i
    2424
    2525psImageErrors.h: psImageErrors.dat
  • trunk/psLib/src/psTest.c

    r3115 r3127  
    3838    psS32 n;
    3939    extern char *optarg;
     40
     41    char* fileName = (char*)testPointFile;
     42    char* lastSlashInFile = strrchr(testPointFile,'/');
     43    if (lastSlashInFile != NULL) {
     44        fileName = lastSlashInFile+1;
     45    }
    4046
    4147    if ( argc > 0 ) {
     
    5864                break;
    5965            case 'l':
    60                 printf( "Test Driver:  %s\n", testPointFile );
     66                printf( "Test Driver:  %s\n", fileName );
    6167                printf( "Package Name: %s\n", packageName );
    6268                printf( "Testpoints:\n" );
     
    7379                    if ( strcmp( optarg, tests[ index ].testPointName ) == 0 ) {
    7480                        success = p_runTest( fp,
    75                                              testPointFile,
     81                                             fileName,
    7682                                             packageName,
    7783                                             tests[ index ].testPointName,
     
    94100                        found = true;
    95101                        success = p_runTest( fp,
    96                                              testPointFile,
     102                                             fileName,
    97103                                             packageName,
    98104                                             tests[ index ].testPointName,
     
    119125            if ( ! tests[ index ].isDuplicateEntry ) {
    120126                success = p_runTest( fp,
    121                                      testPointFile,
     127                                     fileName,
    122128                                     packageName,
    123129                                     tests[ index ].testPointName,
     
    143149    pid_t child;
    144150
    145     p_printPositiveTestHeader( fp, testPointFile, packageName, testPointName );
     151    char* fileName = (char*)testPointFile;
     152    char* lastSlashInFile = strrchr(testPointFile,'/');
     153    if (lastSlashInFile != NULL) {
     154        fileName = lastSlashInFile+1;
     155    }
     156
     157    p_printPositiveTestHeader( fp, fileName, packageName, testPointName );
    146158
    147159    if ( useFork ) {
     
    193205    }
    194206
    195     p_printFooter( fp, testPointFile, packageName, testPointName,
     207    p_printFooter( fp, fileName, packageName, testPointName,
    196208                   ( childReturn == expectedReturn ) );
    197209
     
    206218    char TP[ 80 ];
    207219
     220    char* fileName = (char*)testPointFile;
     221    char* lastSlashInFile = strrchr(testPointFile,'/');
     222    if (lastSlashInFile != NULL) {
     223        fileName = lastSlashInFile+1;
     224    }
     225
    208226    snprintf( TP, 80, "%s{%s}", packageName, testPointName );
    209227
    210228    fprintf( fp, HEADER_TOP );
    211     fprintf( fp, HEADER_LINE_STRING, "TestFile", testPointFile );
     229    fprintf( fp, HEADER_LINE_STRING, "TestFile", fileName);
    212230    fprintf( fp, HEADER_LINE_STRING, "TestPoint", TP );
    213231    fprintf( fp, HEADER_LINE_STRING, "TestType", "Positive" );
     
    224242    char TP[ 80 ];
    225243
     244    char* fileName = (char*)testPointFile;
     245    char* lastSlashInFile = strrchr(testPointFile,'/');
     246    if (lastSlashInFile != NULL) {
     247        fileName = lastSlashInFile+1;
     248    }
     249
    226250    snprintf( TP, 80, "%s{%s}", packageName, testPointName );
    227251
    228252    fprintf( fp, HEADER_TOP );
    229     fprintf( fp, HEADER_LINE_STRING, "TestFile", testPointFile );
     253    fprintf( fp, HEADER_LINE_STRING, "TestFile", fileName);
    230254    fprintf( fp, HEADER_LINE_STRING, "TestPoint", TP );
    231255    fprintf( fp, HEADER_LINE_STRING, "TestType", "Negative" );
     
    242266                    psBool success )
    243267{
     268    char* fileName = (char*)testPointFile;
     269    char* lastSlashInFile = strrchr(testPointFile,'/');
     270    if (lastSlashInFile != NULL) {
     271        fileName = lastSlashInFile+1;
     272    }
     273
    244274    if ( success ) {
    245         fprintf( fp, "\n---> TESTPOINT PASSED (%s{%s} | %s)\n\n", packageName, testPointName, testPointFile );
     275        fprintf( fp, "\n---> TESTPOINT PASSED (%s{%s} | %s)\n\n", packageName, testPointName, fileName);
    246276    } else {
    247         fprintf( fp, "\n---> TESTPOINT FAILED (%s{%s} | %s)\n\n", packageName, testPointName, testPointFile );
    248     }
    249 }
     277        fprintf( fp, "\n---> TESTPOINT FAILED (%s{%s} | %s)\n\n", packageName, testPointName, fileName);
     278    }
     279}
  • trunk/psLib/src/sysUtils/Makefile.am

    r3122 r3127  
    2222
    2323BUILT_SOURCES = psSysUtilsErrors.h
    24 EXTRA_DIST = psSysUtilsErrors.dat psSysUtilsErrors.h
     24EXTRA_DIST = psSysUtilsErrors.dat psSysUtilsErrors.h sysUtils.i
    2525
    2626psSysUtilsErrors.h: psSysUtilsErrors.dat
  • trunk/psLib/swig

    • Property svn:ignore
      •  

        old new  
         1psLibModule
        12Makefile
        23Makefile.in
  • trunk/psLib/swig/.cvsignore

    r3125 r3127  
     1psLibModule
    12Makefile
    23Makefile.in
  • trunk/psLib/swig/Makefile.am

    r3123 r3127  
    11
    2 EXTRA_DIST = pslib.i psLibModule/Makefile.PL
     2EXTRA_DIST = pslib.i Makefile.PL
    33
    4 CLEANFILES = psLibModule/pslib_wrap.c psLibModule/pslib.pm \
    5 psLibModule/Makefile psLibModule/pm_to_blib psLibModule/pslib.bs \
    6 psLibModule/pslib_wrap.o psLibModule/setup.txt
     4clean-generic:
     5        rm -rf psLibModule
    76
    8 SRCDIR = $(shell cd $(top_srcdir)/src && pwd)
    9 
    10 INCLUDES = -I$(SRCDIR) -I$(SRCDIR)/astronomy -I$(SRCDIR)/collections \
    11 -I$(SRCDIR)/dataManip -I$(SRCDIR)/fileUtils -I$(SRCDIR)/image \
    12 -I$(SRCDIR)/sysUtils
     7INCLUDES = -I$(top_srcdir)/src \
     8        -I$(top_srcdir)/src/astronomy \
     9        -I$(top_srcdir)/src/collections \
     10        -I$(top_srcdir)/src/dataManip \
     11        -I$(top_srcdir)/src/fileUtils \
     12        -I$(top_srcdir)/src/image \
     13        -I$(top_srcdir)/src/sysUtils
    1314
    1415####################################################
    1516## PsLibModule swig build section. 
    1617
    17 psLibModule/setup.txt:Makefile
     18psLibModule:
     19        mkdir psLibModule
     20
     21psLibModule/Makefile.PL: psLibModule
     22        cp $(srcdir)/Makefile.PL psLibModule/Makefile.PL
     23
     24psLibModule/setup.txt:psLibModule Makefile
    1825        echo "includes=$(INCLUDES)" > psLibModule/setup.txt
    19         echo "ldflags=$(PSLIB_LIBS)" >> psLibModule/setup.txt
     26        echo "ldflags=-L$(top_builddir)/src $(PSLIB_LIBS)" >> psLibModule/setup.txt
    2027        echo "cflags=$(PSLIB_CFLAGS) -Wno-unused -Wno-strict-aliasing" >> psLibModule/setup.txt
    2128
    22 psLibModule/pslib_wrap.c: pslib.i
    23         $(SWIG) -perl $(INCLUDES) -w451 -o $@ $?
     29psLibModule/pslib_wrap.c: psLibModule pslib.i
     30        echo Source directory = $(top_srcdir)
     31        $(SWIG) -perl $(INCLUDES) -w451 -o $@ $(srcdir)/pslib.i
    2432
    25 psLibModule/Makefile:psLibModule/Makefile.PL psLibModule/setup.txt
     33psLibModule/Makefile:psLibModule psLibModule/Makefile.PL psLibModule/setup.txt
    2634        cd psLibModule && $(PERL) Makefile.PL PREFIX=$(PERL_PREFIX)
    2735
    28 all:psLibModule/pslib_wrap.c psLibModule/Makefile
     36all: psLibModule psLibModule/pslib_wrap.c psLibModule/Makefile.PL
     37
     38swig: all psLibModule/Makefile
    2939        cd psLibModule && make
    3040
    31 install-exec-hook: all
     41swig-check: swig
     42        export PERLLIB=psLibModule && perl -Mpslib -e 'print "pslib version = " . pslib::psLibVersion() . "\n";'
     43
     44swig-install: swig
    3245        cd psLibModule && make install
     46
     47install-exec-hook: swig-install
    3348
    3449uninstall-local: psLibModule/Makefile
  • trunk/psLib/test/FullUnitTest

    r3115 r3127  
    1919#  RETURN : integer number of tests which failed
    2020#
    21 #  $Revision: 1.16 $  $Name: not supported by cvs2svn $
    22 #  $Date: 2005-02-03 00:54:12 $
     21#  $Revision: 1.17 $  $Name: not supported by cvs2svn $
     22#  $Date: 2005-02-04 22:49:37 $
    2323#
    2424#  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     
    659659        s/$hostname\s*/<HOST>/g;
    660660        s/: Line \d+/: Line <LINENO>/g;
    661         s/\:\d+/\:<LINENO>/g;
     661        s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
    662662        s/allocate \d+ bytes at/allocate <N> bytes at/g;
    663663
     
    687687        s/$hostname\s*/<HOST>/g;
    688688        s/: Line \d+/: Line <LINENO>/g;
    689         s/\:\d+/\:<LINENO>/g;
     689        s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
    690690        s/allocate \d+ bytes at/allocate <N> bytes at/g;
    691691
  • trunk/psLib/test/astronomy/Makefile.am

    r3115 r3127  
    1111        $(all_includes)
    1212
    13 PSLIB_LIBS = `sh $(top_srcdir)/pslib-config --libs`
    14 AM_LDFLAGS = $(PSLIB_LIBS) -L$(top_srcdir)/src
     13AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
    1514
    1615check_PROGRAMS = tst_psTime_01 \
     
    3029         tst_psAstrometry01
    3130
    32 TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest
     31TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified
     32 
    3333TESTS = tst_psTime_01 \
    3434         tst_psTime_02 \
     
    6666BUILT_SOURCES = test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4
    6767
     68EXTRA_DIST = test.psTime.config1.template \
     69        test.psTime.config2.template \
     70        test.psTime.config3.template \
     71        test.psTime.config4.template \
     72        verified
     73
    6874test.psTime.config1: test.psTime.config1.template
    6975        sed 's|PREFIX|$(prefix)|' $? > $@
  • trunk/psLib/test/astronomy/verified/tst_psCoord.stderr

    r2999 r3127  
    1414\**********************************************************************************/
    1515
    16 <DATE><TIME>|<HOST>|E|psPlaneTransformAlloc (psCoord.c:<LINENO>)
     16<DATE><TIME>|<HOST>|E|psPlaneTransformAlloc (FILE:LINENO)
    1717    Error: n1 is less than 0.
    18 <DATE><TIME>|<HOST>|E|psPlaneTransformAlloc (psCoord.c:<LINENO>)
     18<DATE><TIME>|<HOST>|E|psPlaneTransformAlloc (FILE:LINENO)
    1919    Error: n2 is less than 0.
    2020
     
    2727\**********************************************************************************/
    2828
    29 <DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (psCoord.c:<LINENO>)
     29<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (FILE:LINENO)
    3030    Error: n1 is less than 0.
    31 <DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (psCoord.c:<LINENO>)
     31<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (FILE:LINENO)
    3232    Error: n2 is less than 0.
    33 <DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (psCoord.c:<LINENO>)
     33<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (FILE:LINENO)
    3434    Error: n3 is less than 0.
    35 <DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (psCoord.c:<LINENO>)
     35<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (FILE:LINENO)
    3636    Error: n4 is less than 0.
    3737
     
    4444\**********************************************************************************/
    4545
    46 <DATE><TIME>|<HOST>|E|psPlaneTransformApply (psCoord.c:<LINENO>)
     46<DATE><TIME>|<HOST>|E|psPlaneTransformApply (FILE:LINENO)
    4747    Unallowable operation: transform is NULL.
    48 <DATE><TIME>|<HOST>|E|psPlaneTransformApply (psCoord.c:<LINENO>)
     48<DATE><TIME>|<HOST>|E|psPlaneTransformApply (FILE:LINENO)
    4949    Unallowable operation: transform->x is NULL.
    50 <DATE><TIME>|<HOST>|E|psPlaneTransformApply (psCoord.c:<LINENO>)
     50<DATE><TIME>|<HOST>|E|psPlaneTransformApply (FILE:LINENO)
    5151    Unallowable operation: transform->y is NULL.
    52 <DATE><TIME>|<HOST>|E|psPlaneTransformApply (psCoord.c:<LINENO>)
     52<DATE><TIME>|<HOST>|E|psPlaneTransformApply (FILE:LINENO)
    5353    Unallowable operation: coords is NULL.
    5454
     
    6161\**********************************************************************************/
    6262
    63 <DATE><TIME>|<HOST>|E|psPlaneDistortApply (psCoord.c:<LINENO>)
     63<DATE><TIME>|<HOST>|E|psPlaneDistortApply (FILE:LINENO)
    6464    Unallowable operation: transform is NULL.
    65 <DATE><TIME>|<HOST>|E|psPlaneDistortApply (psCoord.c:<LINENO>)
     65<DATE><TIME>|<HOST>|E|psPlaneDistortApply (FILE:LINENO)
    6666    Unallowable operation: transform->x is NULL.
    67 <DATE><TIME>|<HOST>|E|psPlaneDistortApply (psCoord.c:<LINENO>)
     67<DATE><TIME>|<HOST>|E|psPlaneDistortApply (FILE:LINENO)
    6868    Unallowable operation: transform->y is NULL.
    69 <DATE><TIME>|<HOST>|E|psPlaneDistortApply (psCoord.c:<LINENO>)
     69<DATE><TIME>|<HOST>|E|psPlaneDistortApply (FILE:LINENO)
    7070    Unallowable operation: coords is NULL.
    7171
     
    7878\**********************************************************************************/
    7979
    80 <DATE><TIME>|<HOST>|E|psSphereTransformApply (psCoord.c:<LINENO>)
     80<DATE><TIME>|<HOST>|E|psSphereTransformApply (FILE:LINENO)
    8181    Unallowable operation: transform is NULL.
    82 <DATE><TIME>|<HOST>|E|psSphereTransformApply (psCoord.c:<LINENO>)
     82<DATE><TIME>|<HOST>|E|psSphereTransformApply (FILE:LINENO)
    8383    Unallowable operation: coord is NULL.
    8484
     
    100100\**********************************************************************************/
    101101
    102 <DATE><TIME>|<HOST>|E|psSphereTransformICRSToEcliptic (psCoord.c:<LINENO>)
     102<DATE><TIME>|<HOST>|E|psSphereTransformICRSToEcliptic (FILE:LINENO)
    103103    Unallowable operation: time is NULL.
    104104
     
    111111\**********************************************************************************/
    112112
    113 <DATE><TIME>|<HOST>|E|psSphereTransformEclipticToICRS (psCoord.c:<LINENO>)
     113<DATE><TIME>|<HOST>|E|psSphereTransformEclipticToICRS (FILE:LINENO)
    114114    Unallowable operation: time is NULL.
    115115
     
    140140\**********************************************************************************/
    141141
    142 <DATE><TIME>|<HOST>|E|psSphereGetOffset (psCoord.c:<LINENO>)
     142<DATE><TIME>|<HOST>|E|psSphereGetOffset (FILE:LINENO)
    143143    Unallowable operation: position1 is NULL.
    144 <DATE><TIME>|<HOST>|E|psSphereGetOffset (psCoord.c:<LINENO>)
     144<DATE><TIME>|<HOST>|E|psSphereGetOffset (FILE:LINENO)
    145145    Unallowable operation: position2 is NULL.
    146 <DATE><TIME>|<HOST>|E|psSphereGetOffset (psCoord.c:<LINENO>)
     146<DATE><TIME>|<HOST>|E|psSphereGetOffset (FILE:LINENO)
    147147    Specified offset mode, 0x54321, is not supported.
    148 <DATE><TIME>|<HOST>|E|psSphereGetOffset (psCoord.c:<LINENO>)
     148<DATE><TIME>|<HOST>|E|psSphereGetOffset (FILE:LINENO)
    149149    Specified units, 0x54321, is not supported.
    150150
     
    157157\**********************************************************************************/
    158158
    159 <DATE><TIME>|<HOST>|E|psSphereSetOffset (psCoord.c:<LINENO>)
     159<DATE><TIME>|<HOST>|E|psSphereSetOffset (FILE:LINENO)
    160160    Unallowable operation: position is NULL.
    161 <DATE><TIME>|<HOST>|E|psSphereSetOffset (psCoord.c:<LINENO>)
     161<DATE><TIME>|<HOST>|E|psSphereSetOffset (FILE:LINENO)
    162162    Unallowable operation: offset is NULL.
    163 <DATE><TIME>|<HOST>|E|psSphereSetOffset (psCoord.c:<LINENO>)
     163<DATE><TIME>|<HOST>|E|psSphereSetOffset (FILE:LINENO)
    164164    Specified offset mode, 0x54321, is not supported.
    165 <DATE><TIME>|<HOST>|E|psSphereSetOffset (psCoord.c:<LINENO>)
     165<DATE><TIME>|<HOST>|E|psSphereSetOffset (FILE:LINENO)
    166166    Specified units, 0x54321, is not supported.
    167167
  • trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stderr

    r2612 r3127  
    1 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     1<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    22    Failed to parse the value '9876.54qqq32' of metadata item xPosition, type F64, on line 90 of test.config.
    3 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    44    Failed to read a metadata value on line 96 of test.config.
    5 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     5<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    66    Metadata type '99.999', found on line 102 of test.config, is not invalid.
    7 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    88    More than one '*' character not allowed.  Found on line 108 of test.config.
    9 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     9<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    1010    More than one '@' character not allowed.  Found on line 114 of test.config.
    11 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     11<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    1212    More than one '~' character not allowed.  Found on line 120 of test.config.
    13 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     13<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    1414    Failed to parse the value '9876.54qqq32' of metadata item xPosition, type F64, on line 90 of test.config.
    15 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     15<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    1616    Failed to read a metadata value on line 96 of test.config.
    17 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     17<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    1818    Metadata type '99.999', found on line 102 of test.config, is not invalid.
    19 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     19<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    2020    More than one '*' character not allowed.  Found on line 108 of test.config.
    21 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     21<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    2222    More than one '@' character not allowed.  Found on line 114 of test.config.
    23 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     23<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    2424    More than one '~' character not allowed.  Found on line 120 of test.config.
    25 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     25<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    2626    Duplicate Metadata item, speed, found on line 128 of test.config.  Overwrite not allowed.
    27 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     27<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    2828    Failed to parse the value '9876.54qqq32' of metadata item xPosition, type F64, on line 90 of test.config.
    29 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     29<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    3030    Failed to read a metadata value on line 96 of test.config.
    31 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     31<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    3232    Metadata type '99.999', found on line 102 of test.config, is not invalid.
    33 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     33<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    3434    More than one '*' character not allowed.  Found on line 108 of test.config.
    35 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     35<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    3636    More than one '@' character not allowed.  Found on line 114 of test.config.
    37 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     37<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    3838    More than one '~' character not allowed.  Found on line 120 of test.config.
    39 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     39<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    4040    Unallowable operation: fileName is NULL.
    41 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     41<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    4242    Failed to open file 'abcedfg'. Check if it exists and it has the proper permissions.
  • trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr

    r2858 r3127  
    1 <DATE><TIME>|<HOST>|E|psListRemoveData (psList.c:<LINENO>)
     1<DATE><TIME>|<HOST>|E|psListRemoveData (FILE:LINENO)
    22    Specified data item is not found in the psList.
    3 <DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
    44    Failed to remove metadata item, HISTORY, from metadata list.
    5 <DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
     5<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
    66    Unallowable operation: fileName is NULL.
    7 <DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
    88    FITS error while opening file: missing.dat could not open the named file
    9 <DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
     9<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
    1010    Couldn't close FITS file. FITS error: NULL input pointer
    11 <DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
     11<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
    1212    Specified extension number, 0, is invalid.  Value must be positive if no extension name is given.
    13 <DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
     13<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
    1414    FITS error while locating header 22: tried to move past end of file
    15 <DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
     15<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
    1616    FITS error while locating header AARGH: illegal HDU number
    17 <DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
     17<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
    1818    Specified extension number, 0, is invalid.  Value must be positive if no extension name is given.
  • trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr

    r2613 r3127  
    11<DATE><TIME>|<HOST>|I|main
    22    Following should produce error for null name.
    3 <DATE><TIME>|<HOST>|E|psMetadataItemAllocV (psMetadata.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psMetadataItemAllocV (FILE:LINENO)
    44    Unallowable operation: name is NULL.
    5 <DATE><TIME>|<HOST>|E|psMetadataItemAllocV (psMetadata.c:<LINENO>)
     5<DATE><TIME>|<HOST>|E|psMetadataItemAllocV (FILE:LINENO)
    66    Specified psMetadataType, 11, is not supported.
    7 <DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
    88    Unallowable operation: md is NULL.
    9 <DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
     9<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
    1010    Unallowable operation: metadataItem is NULL.
  • trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr

    r2281 r3127  
    1 <DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
     1<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
    22    Unallowable operation: md is NULL.
    3 <DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
    44    Could not find metadata item, AARGH.
    5 <DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
     5<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
    66    Could not find metadata item at index 22.
    7 <DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
    88    Unallowable operation: md->table is NULL.
    9 <DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
     9<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
    1010    Unallowable operation: md->table is NULL.
    11 <DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
     11<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
    1212    Unallowable operation: md->list is NULL.
    13 <DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
     13<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
    1414    Unallowable operation: md->list is NULL.
    15 <DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
     15<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
    1616    Unallowable operation: metadataItem->name is NULL.
    17 <DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
     17<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
    1818    Unallowable operation: md->table is NULL.
    19 <DATE><TIME>|<HOST>|E|psMetadataAdd (psMetadata.c:<LINENO>)
     19<DATE><TIME>|<HOST>|E|psMetadataAdd (FILE:LINENO)
    2020    Failed to add metadata item to metadata collection list.
  • trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr

    r2858 r3127  
    1 <DATE><TIME>|<HOST>|E|psMetadataLookup (psMetadata.c:<LINENO>)
     1<DATE><TIME>|<HOST>|E|psMetadataLookup (FILE:LINENO)
    22    Unallowable operation: md is NULL.
    3 <DATE><TIME>|<HOST>|E|psMetadataLookup (psMetadata.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psMetadataLookup (FILE:LINENO)
    44    Unallowable operation: key is NULL.
    5 <DATE><TIME>|<HOST>|E|psMetadataGet (psMetadata.c:<LINENO>)
     5<DATE><TIME>|<HOST>|E|psMetadataGet (FILE:LINENO)
    66    Unallowable operation: md is NULL.
    7 <DATE><TIME>|<HOST>|E|psListIteratorSet (psList.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psListIteratorSet (FILE:LINENO)
    88    Specified location, 22, is invalid.
    9 <DATE><TIME>|<HOST>|E|psListGet (psList.c:<LINENO>)
     9<DATE><TIME>|<HOST>|E|psListGet (FILE:LINENO)
    1010    Specified location, 22, is invalid.
    11 <DATE><TIME>|<HOST>|E|psMetadataGet (psMetadata.c:<LINENO>)
     11<DATE><TIME>|<HOST>|E|psMetadataGet (FILE:LINENO)
    1212    Could not find metadata item at index 22.
    13 <DATE><TIME>|<HOST>|E|psMetadataLookup (psMetadata.c:<LINENO>)
     13<DATE><TIME>|<HOST>|E|psMetadataLookup (FILE:LINENO)
    1414    Unallowable operation: md->table is NULL.
    15 <DATE><TIME>|<HOST>|E|psMetadataGet (psMetadata.c:<LINENO>)
     15<DATE><TIME>|<HOST>|E|psMetadataGet (FILE:LINENO)
    1616    Unallowable operation: md->list is NULL.
  • trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr

    r2986 r3127  
    1 <DATE><TIME>|<HOST>|E|psMetadataItemPrint (psMetadataIO.c:<LINENO>)
     1<DATE><TIME>|<HOST>|E|psMetadataItemPrint (FILE:LINENO)
    22    Unallowable operation: fd is NULL.
    3 <DATE><TIME>|<HOST>|E|psMetadataItemPrint (psMetadataIO.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psMetadataItemPrint (FILE:LINENO)
    44    Unallowable operation: format is NULL.
    5 <DATE><TIME>|<HOST>|E|psMetadataItemPrint (psMetadataIO.c:<LINENO>)
     5<DATE><TIME>|<HOST>|E|psMetadataItemPrint (FILE:LINENO)
    66    Unallowable operation: metadataItem is NULL.
  • trunk/psLib/test/astronomy/verified/tst_psTime_02.stderr

    r2326 r3127  
    1 <DATE><TIME>|<HOST>|E|psTimeFromISOTime (psTime.c:<LINENO>)
     1<DATE><TIME>|<HOST>|E|psTimeFromISOTime (FILE:LINENO)
    22    Error: tmTime.tm_mon, 99, is out of range.  Must be between 1 and 12.
    3 <DATE><TIME>|<HOST>|E|psTimeFromISOTime (psTime.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psTimeFromISOTime (FILE:LINENO)
    44    Error: tmTime.tm_mday, 99, is out of range.  Must be between 1 and 31.
    5 <DATE><TIME>|<HOST>|E|psTimeFromISOTime (psTime.c:<LINENO>)
     5<DATE><TIME>|<HOST>|E|psTimeFromISOTime (FILE:LINENO)
    66    Error: tmTime.tm_hour, 99, is out of range.  Must be between 0 and 23.
    7 <DATE><TIME>|<HOST>|E|psTimeFromISOTime (psTime.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psTimeFromISOTime (FILE:LINENO)
    88    Error: tmTime.tm_min, 99, is out of range.  Must be between 0 and 59.
    9 <DATE><TIME>|<HOST>|E|psTimeFromISOTime (psTime.c:<LINENO>)
     9<DATE><TIME>|<HOST>|E|psTimeFromISOTime (FILE:LINENO)
    1010    Error: tmTime.tm_sec, 99, is out of range.  Must be between 0 and 59.
    11 <DATE><TIME>|<HOST>|E|psTimeFromISOTime (psTime.c:<LINENO>)
     11<DATE><TIME>|<HOST>|E|psTimeFromISOTime (FILE:LINENO)
    1212    Error: millisecond, -999, is out of range.  Must be between 0 and 999.
    13 <DATE><TIME>|<HOST>|E|psTimeFromTimeval (psTime.c:<LINENO>)
     13<DATE><TIME>|<HOST>|E|psTimeFromTimeval (FILE:LINENO)
    1414    Unallowable operation: time is NULL.
  • trunk/psLib/test/astronomy/verified/tst_psTime_03.stderr

    r2964 r3127  
    11<DATE><TIME>|<HOST>|I|main
    22    Invalid time type during allocation should generate error message
    3 <DATE><TIME>|<HOST>|E|psTimeAlloc (psTime.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psTimeAlloc (FILE:LINENO)
    44    Specified type, 10, is not supported.
  • trunk/psLib/test/astronomy/verified/tst_psTime_04.stderr

    r3056 r3127  
    1 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     1<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
    22    Failed to open file 'zzz'. Check if it exists and it has the proper permissions.
    3 <DATE><TIME>|<HOST>|E|psLibInit (psConfigure.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psLibInit (FILE:LINENO)
    44    Failed to initialize psTime.
    5 <DATE><TIME>|<HOST>|E|psLookupTableRead (psLookupTable.c:<LINENO>)
     5<DATE><TIME>|<HOST>|E|psLookupTableRead (FILE:LINENO)
    66    Failed to open file bogus/ser7.dat.
    7 <DATE><TIME>|<HOST>|E|psLookupTableRead (psLookupTable.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psLookupTableRead (FILE:LINENO)
    88    Failed to open file bogus/eopc01_1900_2004.dat.
    9 <DATE><TIME>|<HOST>|E|psLookupTableRead (psLookupTable.c:<LINENO>)
     9<DATE><TIME>|<HOST>|E|psLookupTableRead (FILE:LINENO)
    1010    Failed to open file bogus/finals_all.dat.
    11 <DATE><TIME>|<HOST>|E|psLookupTableRead (psLookupTable.c:<LINENO>)
     11<DATE><TIME>|<HOST>|E|psLookupTableRead (FILE:LINENO)
    1212    Failed to open file bogus/tai_utc.dat.
    13 <DATE><TIME>|<HOST>|E|p_psTimeInit (psTime.c:<LINENO>)
     13<DATE><TIME>|<HOST>|E|p_psTimeInit (FILE:LINENO)
    1414    Incorrect number of table files entered. Found: 3. Expected: 4.
    15 <DATE><TIME>|<HOST>|E|p_psTimeInit (psTime.c:<LINENO>)
     15<DATE><TIME>|<HOST>|E|p_psTimeInit (FILE:LINENO)
    1616    Incorrect vector size. Size: 3, Expected 4.
    17 <DATE><TIME>|<HOST>|E|psLibInit (psConfigure.c:<LINENO>)
     17<DATE><TIME>|<HOST>|E|psLibInit (FILE:LINENO)
    1818    Failed to initialize psTime.
    19 <DATE><TIME>|<HOST>|E|printError (psLookupTable.c:<LINENO>)
     19<DATE><TIME>|<HOST>|E|printError (FILE:LINENO)
    2020    Unable to parse string, 53yyy244 on line 16.
  • trunk/psLib/test/collections/Makefile.am

    r3115 r3127  
    1 #Makefile for astronomy functions of psLib
     1#Makefile for collections functions of psLib
    22#
     3EXTRA_DIST = verified
     4
    35INCLUDES = \
    46        -I$(top_srcdir)/src \
     
    1113        $(all_includes)
    1214
    13 AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
     15AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
    1416
    1517check_PROGRAMS = \
     
    3234         tst_psScalar
    3335 
    34 TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest
     36TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
    3537TESTS = \
    3638         tst_psVector          \
  • trunk/psLib/test/collections/verified/tst_psArray.stderr

    r2855 r3127  
    11<DATE><TIME>|<HOST>|I|main
    22    Following should generate an error message.
    3 <DATE><TIME>|<HOST>|E|psArrayRealloc (psArray.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psArrayRealloc (FILE:LINENO)
    44    psArrayRealloc must be given a non-NULL psArray to resize.
    5 <DATE><TIME>|<HOST>|E|psArrayRemove (psArray.c:<LINENO>)
     5<DATE><TIME>|<HOST>|E|psArrayRemove (FILE:LINENO)
    66    Specified psArray can not be NULL.
  • trunk/psLib/test/collections/verified/tst_psBitSet.stderr

    r2281 r3127  
    99<DATE><TIME>|<HOST>|I|testBitSet01a
    1010    Following is an error.
    11 <DATE><TIME>|<HOST>|E|psBitSetAlloc (psBitSet.c:<LINENO>)
     11<DATE><TIME>|<HOST>|E|psBitSetAlloc (FILE:LINENO)
    1212    The number of bit in a psBitSet (-4) must be greater than zero.
    1313
     
    3232<DATE><TIME>|<HOST>|I|testBitSet01b
    3333    Following should be an error
    34 <DATE><TIME>|<HOST>|E|psBitSetSet (psBitSet.c:<LINENO>)
     34<DATE><TIME>|<HOST>|E|psBitSetSet (FILE:LINENO)
    3535    The specified bit position (-4) is invalid.  Position must be between 0 and 23.
    3636<DATE><TIME>|<HOST>|I|testBitSet01b
    3737    Following should be an error
    38 <DATE><TIME>|<HOST>|E|psBitSetSet (psBitSet.c:<LINENO>)
     38<DATE><TIME>|<HOST>|E|psBitSetSet (FILE:LINENO)
    3939    The specified bit position (200) is invalid.  Position must be between 0 and 23.
    4040<DATE><TIME>|<HOST>|I|testBitSet01b
    4141    Following should be an error
    42 <DATE><TIME>|<HOST>|E|psBitSetSet (psBitSet.c:<LINENO>)
     42<DATE><TIME>|<HOST>|E|psBitSetSet (FILE:LINENO)
    4343    Can not operate on a NULL psBitSet.
    4444
     
    5656<DATE><TIME>|<HOST>|I|testBitSet01c
    5757    Following should be an error
    58 <DATE><TIME>|<HOST>|E|psBitSetTest (psBitSet.c:<LINENO>)
     58<DATE><TIME>|<HOST>|E|psBitSetTest (FILE:LINENO)
    5959    The specified bit position (-4) is invalid.  Position must be between 0 and 23.
    6060<DATE><TIME>|<HOST>|I|testBitSet01c
    6161    Following should be an error
    62 <DATE><TIME>|<HOST>|E|psBitSetTest (psBitSet.c:<LINENO>)
     62<DATE><TIME>|<HOST>|E|psBitSetTest (FILE:LINENO)
    6363    The specified bit position (200) is invalid.  Position must be between 0 and 23.
    6464<DATE><TIME>|<HOST>|I|testBitSet01c
    6565    Following should be an error
    66 <DATE><TIME>|<HOST>|E|psBitSetTest (psBitSet.c:<LINENO>)
     66<DATE><TIME>|<HOST>|E|psBitSetTest (FILE:LINENO)
    6767    Can not operate on a NULL psBitSet.
    6868
     
    7777<DATE><TIME>|<HOST>|I|testBitSet06
    7878    Following should be an error
    79 <DATE><TIME>|<HOST>|E|psBitSetOp (psBitSet.c:<LINENO>)
     79<DATE><TIME>|<HOST>|E|psBitSetOp (FILE:LINENO)
    8080    The psBitSet operand must be the same size.
    8181<DATE><TIME>|<HOST>|I|testBitSet06
    8282    Following is an error.
    83 <DATE><TIME>|<HOST>|E|psBitSetOp (psBitSet.c:<LINENO>)
     83<DATE><TIME>|<HOST>|E|psBitSetOp (FILE:LINENO)
    8484    Specified operator, FOO, is invalid.  Valid operators are AND, OR, and XOR.
    8585<DATE><TIME>|<HOST>|I|testBitSet06
    8686    Following is an error.
    87 <DATE><TIME>|<HOST>|E|psBitSetOp (psBitSet.c:<LINENO>)
     87<DATE><TIME>|<HOST>|E|psBitSetOp (FILE:LINENO)
    8888    Specified operator, FOO, is invalid.  Valid operators are AND, OR, and XOR.
    8989
  • trunk/psLib/test/collections/verified/tst_psHash01.stderr

    r2620 r3127  
    11<DATE><TIME>|<HOST>|I|main
    22    Following should generate an error message: psHashAdd with null table
    3 <DATE><TIME>|<HOST>|E|psHashAdd (psHash.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psHashAdd (FILE:LINENO)
    44    Input psHash can not be NULL.
    55<DATE><TIME>|<HOST>|I|main
    66    Following should generate an error message: psHashAdd with null key
    7 <DATE><TIME>|<HOST>|E|psHashAdd (psHash.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psHashAdd (FILE:LINENO)
    88    Input key can not be NULL.
    99<DATE><TIME>|<HOST>|I|main
    1010    Following should generate an error message: psHashAdd with null data
    11 <DATE><TIME>|<HOST>|E|psHashAdd (psHash.c:<LINENO>)
     11<DATE><TIME>|<HOST>|E|psHashAdd (FILE:LINENO)
    1212    Input data can not be NULL.
  • trunk/psLib/test/collections/verified/tst_psHash02.stderr

    r2622 r3127  
    11<DATE><TIME>|<HOST>|I|main
    22    Following should generate an error message: psHashLookup with null table
    3 <DATE><TIME>|<HOST>|E|psHashLookup (psHash.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psHashLookup (FILE:LINENO)
    44    Input psHash can not be NULL.
    55<DATE><TIME>|<HOST>|I|main
    66    Following should generate an error message: psHashLookup with null key
    7 <DATE><TIME>|<HOST>|E|psHashLookup (psHash.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psHashLookup (FILE:LINENO)
    88    Input key can not be NULL.
  • trunk/psLib/test/collections/verified/tst_psHash03.stderr

    r2624 r3127  
    11<DATE><TIME>|<HOST>|I|main
    22    Following should generate an error message: psHashRemove with null table
    3 <DATE><TIME>|<HOST>|E|psHashRemove (psHash.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psHashRemove (FILE:LINENO)
    44    Input psHash can not be NULL.
    55<DATE><TIME>|<HOST>|I|main
    66    Following should generate an error message: psHashRemove with null key
    7 <DATE><TIME>|<HOST>|E|psHashRemove (psHash.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psHashRemove (FILE:LINENO)
    88    Input key can not be NULL.
  • trunk/psLib/test/collections/verified/tst_psHash05.stderr

    r2969 r3127  
    77<DATE><TIME>|<HOST>|I|hashToArray
    88    Following should be an error.
    9 <DATE><TIME>|<HOST>|E|psHashToArray (psHash.c:<LINENO>)
     9<DATE><TIME>|<HOST>|E|psHashToArray (FILE:LINENO)
    1010    Input psHash can not be NULL.
    1111
  • trunk/psLib/test/collections/verified/tst_psList.stderr

    r3112 r3127  
    2020<DATE><TIME>|<HOST>|I|testListAdd
    2121    Following should generate an error for using NULL list.
    22 <DATE><TIME>|<HOST>|E|psListAdd (psList.c:<LINENO>)
     22<DATE><TIME>|<HOST>|E|psListAdd (FILE:LINENO)
    2323    Specified psList reference is NULL.
    2424<DATE><TIME>|<HOST>|I|testListAdd
    2525    Following should generate an error msg to add NULL data
    26 <DATE><TIME>|<HOST>|E|psListAdd (psList.c:<LINENO>)
     26<DATE><TIME>|<HOST>|E|psListAdd (FILE:LINENO)
    2727    Specified data item is NULL.
    2828<DATE><TIME>|<HOST>|I|testListAdd
    2929    Following should error with invalid insert location
    30 <DATE><TIME>|<HOST>|E|psListIteratorSet (psList.c:<LINENO>)
     30<DATE><TIME>|<HOST>|E|psListIteratorSet (FILE:LINENO)
    3131    Specified location, -7, is invalid.
    3232<DATE><TIME>|<HOST>|I|testListAdd
     
    4545<DATE><TIME>|<HOST>|I|testListGet
    4646    Following should be an error
    47 <DATE><TIME>|<HOST>|E|psListGet (psList.c:<LINENO>)
     47<DATE><TIME>|<HOST>|E|psListGet (FILE:LINENO)
    4848    Specified psList reference is NULL.
    49 <DATE><TIME>|<HOST>|E|psListIteratorSet (psList.c:<LINENO>)
     49<DATE><TIME>|<HOST>|E|psListIteratorSet (FILE:LINENO)
    5050    Specified location, 5, is invalid.
    51 <DATE><TIME>|<HOST>|E|psListGet (psList.c:<LINENO>)
     51<DATE><TIME>|<HOST>|E|psListGet (FILE:LINENO)
    5252    Specified location, 5, is invalid.
    53 <DATE><TIME>|<HOST>|E|psListIteratorSet (psList.c:<LINENO>)
     53<DATE><TIME>|<HOST>|E|psListIteratorSet (FILE:LINENO)
    5454    Specified location, 4, is invalid.
    55 <DATE><TIME>|<HOST>|E|psListGet (psList.c:<LINENO>)
     55<DATE><TIME>|<HOST>|E|psListGet (FILE:LINENO)
    5656    Specified location, 4, is invalid.
    5757
     
    6666<DATE><TIME>|<HOST>|I|testListRemove
    6767    Following should be an error
    68 <DATE><TIME>|<HOST>|E|psListRemove (psList.c:<LINENO>)
     68<DATE><TIME>|<HOST>|E|psListRemove (FILE:LINENO)
    6969    Specified psList reference is NULL.
    7070<DATE><TIME>|<HOST>|I|testListRemove
    7171    Next message should be an error
    72 <DATE><TIME>|<HOST>|E|psListRemoveData (psList.c:<LINENO>)
     72<DATE><TIME>|<HOST>|E|psListRemoveData (FILE:LINENO)
    7373    Specified data item is NULL.
    7474<DATE><TIME>|<HOST>|I|testListRemove
    7575    Next message should be an error
    76 <DATE><TIME>|<HOST>|E|psListRemoveData (psList.c:<LINENO>)
     76<DATE><TIME>|<HOST>|E|psListRemoveData (FILE:LINENO)
    7777    Specified data item is not found in the psList.
    7878<DATE><TIME>|<HOST>|I|testListRemove
    7979    NULL list in psListRemoveData should generate error message.
    80 <DATE><TIME>|<HOST>|E|psListRemoveData (psList.c:<LINENO>)
     80<DATE><TIME>|<HOST>|E|psListRemoveData (FILE:LINENO)
    8181    Specified psList reference is NULL.
    8282
     
    131131<DATE><TIME>|<HOST>|I|testListAddAfter
    132132    NULL data pointer should generate error message
    133 <DATE><TIME>|<HOST>|E|psListAddAfter (psList.c:<LINENO>)
     133<DATE><TIME>|<HOST>|E|psListAddAfter (FILE:LINENO)
    134134    Specified data item is NULL.
    135135<DATE><TIME>|<HOST>|I|testListAddAfter
    136136    NULL iterator should generate error message
    137 <DATE><TIME>|<HOST>|E|psListAddAfter (psList.c:<LINENO>)
     137<DATE><TIME>|<HOST>|E|psListAddAfter (FILE:LINENO)
    138138    Specified iterator is NULL.
    139139<DATE><TIME>|<HOST>|I|testListAddAfter
    140140    Non-mutable list should generate error message
    141 <DATE><TIME>|<HOST>|E|psListAddAfter (psList.c:<LINENO>)
     141<DATE><TIME>|<HOST>|E|psListAddAfter (FILE:LINENO)
    142142    Specified iterator indicates list is non-mutable.
    143143
     
    152152<DATE><TIME>|<HOST>|I|testListAddBefore
    153153    NULL data pointer should generate error message
    154 <DATE><TIME>|<HOST>|E|psListAddBefore (psList.c:<LINENO>)
     154<DATE><TIME>|<HOST>|E|psListAddBefore (FILE:LINENO)
    155155    Specified data item is NULL.
    156156<DATE><TIME>|<HOST>|I|testListAddBefore
    157157    NULL iterator should generate error message
    158 <DATE><TIME>|<HOST>|E|psListAddBefore (psList.c:<LINENO>)
     158<DATE><TIME>|<HOST>|E|psListAddBefore (FILE:LINENO)
    159159    Specified iterator is NULL.
    160160<DATE><TIME>|<HOST>|I|testListAddBefore
    161161    Non-mutable list should generate error message
    162 <DATE><TIME>|<HOST>|E|psListAddBefore (psList.c:<LINENO>)
     162<DATE><TIME>|<HOST>|E|psListAddBefore (FILE:LINENO)
    163163    Specified iterator indicates list is non-mutable.
    164164
  • trunk/psLib/test/collections/verified/tst_psScalar.stderr

    r2668 r3127  
    99<DATE><TIME>|<HOST>|I|testScalarAlloc
    1010    Following should generate an error message
    11 <DATE><TIME>|<HOST>|E|psScalarAlloc (psScalar.c:<LINENO>)
     11<DATE><TIME>|<HOST>|E|psScalarAlloc (FILE:LINENO)
    1212    Specified datatype (4865) is unsupported by psScalar.
    1313
     
    2424<DATE><TIME>|<HOST>|I|testScalarCopy
    2525    Following should generate an error message
    26 <DATE><TIME>|<HOST>|E|psScalarCopy (psScalar.c:<LINENO>)
     26<DATE><TIME>|<HOST>|E|psScalarCopy (FILE:LINENO)
    2727    Specified datatype (4865) is unsupported by psScalar.
    2828<DATE><TIME>|<HOST>|I|testScalarCopy
    2929    Following should generate an error message
    30 <DATE><TIME>|<HOST>|E|psScalarCopy (psScalar.c:<LINENO>)
     30<DATE><TIME>|<HOST>|E|psScalarCopy (FILE:LINENO)
    3131    Can not copy a NULL psScalar.
    3232
  • trunk/psLib/test/collections/verified/tst_psVector.stderr

    r2281 r3127  
    33<DATE><TIME>|<HOST>|I|main
    44    Following should be an error message.
    5 <DATE><TIME>|<HOST>|E|psVectorRealloc (psVector.c:<LINENO>)
     5<DATE><TIME>|<HOST>|E|psVectorRealloc (FILE:LINENO)
    66    psVectorRealloc must a given a non-NULL psVector to resize.  Desired datatype unknown.
  • trunk/psLib/test/collections/verified/tst_psVectorSort_01.stderr

    r2669 r3127  
    11<DATE><TIME>|<HOST>|I|main
    22    Following should generate an error messgae
    3 <DATE><TIME>|<HOST>|E|psVectorSort (psVector.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psVectorSort (FILE:LINENO)
    44    Input psVector is an unsupported type (4865).
  • trunk/psLib/test/collections/verified/tst_psVectorSort_02.stderr

    r2677 r3127  
    11<DATE><TIME>|<HOST>|I|main
    22    Following should generate an error message
    3 <DATE><TIME>|<HOST>|E|psVectorSortIndex (psVector.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psVectorSortIndex (FILE:LINENO)
    44    psVectorSort can not sort a NULL psVector.
    55<DATE><TIME>|<HOST>|I|main
    66    Following should generate two error messages(psVectorSort,psVectorSortIndex)
    7 <DATE><TIME>|<HOST>|E|psVectorSort (psVector.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psVectorSort (FILE:LINENO)
    88    Input psVector is an unsupported type (4865).
    9 <DATE><TIME>|<HOST>|E|psVectorSortIndex (psVector.c:<LINENO>)
     9<DATE><TIME>|<HOST>|E|psVectorSortIndex (FILE:LINENO)
    1010    Input psVector is an unsupported type (4865).
  • trunk/psLib/test/collections/verified/tst_psVectorSort_04.stderr

    r2281 r3127  
    1 <DATE><TIME>|<HOST>|E|psVectorSort (psVector.c:<LINENO>)
     1<DATE><TIME>|<HOST>|E|psVectorSort (FILE:LINENO)
    22    psVectorSort can not sort a NULL psVector.
  • trunk/psLib/test/dataIO/Makefile.am

    r3115 r3127  
    1 #Makefile for astronomy functions of psLib
     1#Makefile for fileUtils functions of psLib
    22#
     3EXTRA_DIST = verified
     4
    35INCLUDES = \
    46        -I$(top_srcdir)/src \
     
    1113        $(all_includes)
    1214
    13 AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
     15AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
    1416
    1517check_PROGRAMS = \
     
    1719        tst_psFits
    1820
    19 TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest
     21TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
    2022TESTS = \
    2123        tst_psLookupTable_01 \
  • trunk/psLib/test/dataIO/verified/tst_psFits.stderr

    r3028 r3127  
    1616<DATE><TIME>|<HOST>|I|tst_psFitsMoveExtName
    1717    Following should be an error.
    18 <DATE><TIME>|<HOST>|E|psFitsMoveExtName (psFits.c:<LINENO>)
     18<DATE><TIME>|<HOST>|E|psFitsMoveExtName (FILE:LINENO)
    1919    Could not find HDU 'bogus' in file multi.fits.
    2020    CFITSIO Error: illegal HDU number
    2121<DATE><TIME>|<HOST>|I|tst_psFitsMoveExtName
    2222    Following should be an error.
    23 <DATE><TIME>|<HOST>|E|psFitsMoveExtName (psFits.c:<LINENO>)
     23<DATE><TIME>|<HOST>|E|psFitsMoveExtName (FILE:LINENO)
    2424    The input psFits object can not NULL.
    2525<DATE><TIME>|<HOST>|I|tst_psFitsMoveExtName
    2626    Following should be an error.
    27 <DATE><TIME>|<HOST>|E|psFitsMoveExtName (psFits.c:<LINENO>)
     27<DATE><TIME>|<HOST>|E|psFitsMoveExtName (FILE:LINENO)
    2828    Specified extension name can not be NULL.
    2929
     
    3838<DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
    3939    Following should be an error.
    40 <DATE><TIME>|<HOST>|E|psFitsGetSize (psFits.c:<LINENO>)
     40<DATE><TIME>|<HOST>|E|psFitsGetSize (FILE:LINENO)
    4141    The input psFits object can not NULL.
    4242<DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
    4343    Following should be an error.
    44 <DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
     44<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
    4545    Could not move to specified HDU #-1 in file multi.fits.
    4646    CFITSIO Error: illegal HDU number
    4747<DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
    4848    Following should be an error.
    49 <DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
     49<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
    5050    Could not move -1 HDUs from current position in file multi.fits.
    5151    CFITSIO Error: illegal HDU number
    5252<DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
    5353    Following should be an error.
    54 <DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
     54<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
    5555    Could not move to specified HDU #8 in file multi.fits.
    5656    CFITSIO Error: tried to move past end of file
    5757<DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
    5858    Following should be an error.
    59 <DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
     59<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
    6060    Could not move 1 HDUs from current position in file multi.fits.
    6161    CFITSIO Error: tried to move past end of file
    6262<DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
    6363    Following should be an error.
    64 <DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
     64<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
    6565    The input psFits object can not NULL.
    6666
     
    7575<DATE><TIME>|<HOST>|I|tst_psFitsReadHeader
    7676    following should be an error (input psFits = NULL)
    77 <DATE><TIME>|<HOST>|E|psFitsReadHeader (psFits.c:<LINENO>)
     77<DATE><TIME>|<HOST>|E|psFitsReadHeader (FILE:LINENO)
    7878    The input psFits object can not NULL.
    7979
     
    8686\**********************************************************************************/
    8787
    88 <DATE><TIME>|<HOST>|E|psFitsReadHeaderSet (psFits.c:<LINENO>)
     88<DATE><TIME>|<HOST>|E|psFitsReadHeaderSet (FILE:LINENO)
    8989    The input psFits object can not NULL.
    9090
     
    9797\**********************************************************************************/
    9898
    99 <DATE><TIME>|<HOST>|E|psFitsReadTable (psFits.c:<LINENO>)
     99<DATE><TIME>|<HOST>|E|psFitsReadTable (FILE:LINENO)
    100100    The input psFits object can not NULL.
    101101
     
    119119<DATE><TIME>|<HOST>|I|testImageWrite
    120120    Following should generate an error message because input image is null.
    121 <DATE><TIME>|<HOST>|E|psFitsWriteImage (psFits.c:<LINENO>)
     121<DATE><TIME>|<HOST>|E|psFitsWriteImage (FILE:LINENO)
    122122    The input psImage was NULL.  Need a non-NULL psImage for operation to be performed.
    123123
  • trunk/psLib/test/dataManip/Makefile.am

    r3115 r3127  
    1 #Makefile for astronomy functions of psLib
     1#Makefile for dataManip functions of psLib
    22#
     3EXTRA_DIST = verified
     4
    35INCLUDES = \
    46        -I$(top_srcdir)/src \
     
    1113        $(all_includes)
    1214
    13 AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
     15AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
    1416
    1517check_PROGRAMS = \
     
    5557        tst_psVectorFFT
    5658
    57 TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest
     59TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
    5860TESTS = \
    5961        tst_psFunc00 \
  • trunk/psLib/test/dataManip/verified/tst_psFunc02.stderr

    r2717 r3127  
    11<DATE><TIME>|<HOST>|I|main
    22    Following should generate an error message.
    3 <DATE><TIME>|<HOST>|E|psSpline1DAlloc (psFunctions.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psSpline1DAlloc (FILE:LINENO)
    44    Error: max and min are equal.
    55<DATE><TIME>|<HOST>|I|main
    66    Following should generate an error message
    7 <DATE><TIME>|<HOST>|E|psSpline1DAlloc (psFunctions.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psSpline1DAlloc (FILE:LINENO)
    88    Error: max and min are equal.
    99<DATE><TIME>|<HOST>|I|main
    1010    Following should generate an error message.
    11 <DATE><TIME>|<HOST>|E|psSpline1DAllocGeneric (psFunctions.c:<LINENO>)
     11<DATE><TIME>|<HOST>|E|psSpline1DAllocGeneric (FILE:LINENO)
    1212    Error: order is less than 0.
    1313<DATE><TIME>|<HOST>|I|main
    1414    Following should generate an error message.
    15 <DATE><TIME>|<HOST>|E|psSpline1DAllocGeneric (psFunctions.c:<LINENO>)
     15<DATE><TIME>|<HOST>|E|psSpline1DAllocGeneric (FILE:LINENO)
    1616    Unallowable operation: psVector bounds or its data is NULL.
    1717<DATE><TIME>|<HOST>|I|main
    1818    Following should generate an error message.
    19 <DATE><TIME>|<HOST>|E|psSpline1DAllocGeneric (psFunctions.c:<LINENO>)
     19<DATE><TIME>|<HOST>|E|psSpline1DAllocGeneric (FILE:LINENO)
    2020    Unallowable operation: psVector bounds has no elements.
  • trunk/psLib/test/dataManip/verified/tst_psHist00.stderr

    r2718 r3127  
    11<DATE><TIME>|<HOST>|I|main
    22    Following should generate an error message.
    3 <DATE><TIME>|<HOST>|E|psHistogramAlloc (psStats.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psHistogramAlloc (FILE:LINENO)
    44    Error: (lower > upper) (30.000000 20.000000)
  • trunk/psLib/test/dataManip/verified/tst_psHist02.stderr

    r2721 r3127  
    11<DATE><TIME>|<HOST>|I|main
    22    Following should generate an error message.
    3 <DATE><TIME>|<HOST>|E|psVectorHistogram (psStats.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psVectorHistogram (FILE:LINENO)
    44    Unallowable operation: out is NULL.
    55<DATE><TIME>|<HOST>|I|main
    66    Following should generate an error message.
    7 <DATE><TIME>|<HOST>|E|psVectorHistogram (psStats.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psVectorHistogram (FILE:LINENO)
    88    Unallowable operation: psVector in or its data is NULL.
  • trunk/psLib/test/dataManip/verified/tst_psMatrix02.stderr

    r2678 r3127  
    1 <DATE><TIME>|<HOST>|E|psMatrixTranspose (psMatrix.c:<LINENO>)
     1<DATE><TIME>|<HOST>|E|psMatrixTranspose (FILE:LINENO)
    22    Invalid operation: Pointer to inImage is same as outImage.
    3 <DATE><TIME>|<HOST>|E|psMatrixTranspose (psMatrix.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psMatrixTranspose (FILE:LINENO)
    44    Unallowable operation: psImage inImage or its data is NULL.
    5 <DATE><TIME>|<HOST>|E|psMatrixTranspose (psMatrix.c:<LINENO>)
     5<DATE><TIME>|<HOST>|E|psMatrixTranspose (FILE:LINENO)
    66    Invalid operation. inImage not PS_TYPE_F64.
  • trunk/psLib/test/dataManip/verified/tst_psMatrix03.stderr

    r2682 r3127  
    1 <DATE><TIME>|<HOST>|E|psMatrixLUD (psMatrix.c:<LINENO>)
     1<DATE><TIME>|<HOST>|E|psMatrixLUD (FILE:LINENO)
    22    Unallowable operation: psImage inImage or its data is NULL.
    3 <DATE><TIME>|<HOST>|E|psMatrixLUSolve (psMatrix.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psMatrixLUSolve (FILE:LINENO)
    44    Unallowable operation: psVector inVector or its data is NULL.
    5 <DATE><TIME>|<HOST>|E|psMatrixLUSolve (psMatrix.c:<LINENO>)
     5<DATE><TIME>|<HOST>|E|psMatrixLUSolve (FILE:LINENO)
    66    Unallowable operation: psImage inImage or its data is NULL.
  • trunk/psLib/test/dataManip/verified/tst_psMatrix04.stderr

    r2288 r3127  
    1 <DATE><TIME>|<HOST>|E|psMatrixInvert (psMatrix.c:<LINENO>)
     1<DATE><TIME>|<HOST>|E|psMatrixInvert (FILE:LINENO)
    22    Unallowable operation: psImage inImage or its data is NULL.
    3 <DATE><TIME>|<HOST>|E|psMatrixInvert (psMatrix.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psMatrixInvert (FILE:LINENO)
    44    Unallowable operation: det is NULL.
  • trunk/psLib/test/dataManip/verified/tst_psMatrix07.stderr

    r2696 r3127  
    1 <DATE><TIME>|<HOST>|E|psMatrixToVector (psMatrix.c:<LINENO>)
     1<DATE><TIME>|<HOST>|E|psMatrixToVector (FILE:LINENO)
    22    Unallowable operation: psImage inImage or its data is NULL.
    3 <DATE><TIME>|<HOST>|E|psMatrixToVector (psMatrix.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psMatrixToVector (FILE:LINENO)
    44    Image does not have dim with 1 col or 1 row: (2 x 2).
    5 <DATE><TIME>|<HOST>|E|psVectorToMatrix (psMatrix.c:<LINENO>)
     5<DATE><TIME>|<HOST>|E|psVectorToMatrix (FILE:LINENO)
    66    Unallowable operation: psVector inVector or its data is NULL.
  • trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic03.stderr

    r2693 r3127  
    11<DATE><TIME>|<HOST>|I|main
    22    Following should generate an error message
    3 <DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
    44    Unallowable operation: input1 is NULL.
    55<DATE><TIME>|<HOST>|I|main
    66    Following should generate an error message
    7 <DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
    88    Unallowable operation: input2 is NULL.
    99<DATE><TIME>|<HOST>|I|main
    1010    Following should generate an error message
    11 <DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
     11<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
    1212    Unallowable operation: op is NULL.
    1313<DATE><TIME>|<HOST>|I|main
    1414    Following should generate an error message
    15 <DATE><TIME>|<HOST>|E|psUnaryOp (psMatrixVectorArithmetic.c:<LINENO>)
     15<DATE><TIME>|<HOST>|E|psUnaryOp (FILE:LINENO)
    1616    Unallowable operation: in is NULL.
    1717<DATE><TIME>|<HOST>|I|main
    1818    Following should generate an error message
    19 <DATE><TIME>|<HOST>|E|psUnaryOp (psMatrixVectorArithmetic.c:<LINENO>)
     19<DATE><TIME>|<HOST>|E|psUnaryOp (FILE:LINENO)
    2020    Unallowable operation: op is NULL.
    2121<DATE><TIME>|<HOST>|I|main
    2222    Following should generate an error message
    23 <DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
     23<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
    2424    ptr input1 has type 1028, ptr input2 has type 1032.
    2525<DATE><TIME>|<HOST>|I|main
    2626    Following should generate an error message
    27 <DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
     27<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
    2828    Specified psImage dimensions differed, 2x2 vs 3x3.
    2929<DATE><TIME>|<HOST>|I|main
    3030    Following should generate an error message
    31 <DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
     31<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
    3232    Number of elements inconsistent, 2 vs 3.  Number of elements must match.
    3333<DATE><TIME>|<HOST>|I|main
    3434    Following should generate an error message
    35 <DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
     35<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
    3636    Number of elements inconsistent, 2 vs 3.  Number of elements must match.
    3737<DATE><TIME>|<HOST>|I|main
    3838    Following should generate an two error messages
    39 <DATE><TIME>|<HOST>|E|psVectorRecycle (psVector.c:<LINENO>)
     39<DATE><TIME>|<HOST>|E|psVectorRecycle (FILE:LINENO)
    4040    The input psVector must have a vector dimension type.
    41 <DATE><TIME>|<HOST>|E|psUnaryOp (psMatrixVectorArithmetic.c:<LINENO>)
     41<DATE><TIME>|<HOST>|E|psUnaryOp (FILE:LINENO)
    4242    Couldn't create a proper output psVector.
    4343<DATE><TIME>|<HOST>|I|main
    4444    Following should generate error message
    45 <DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
     45<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
    4646    The minimum operation is not supported with complex data.
    4747<DATE><TIME>|<HOST>|I|main
    4848    Following should generate an error message
    49 <DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
     49<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
    5050    The maximum operation is not supported with complex data.
    5151<DATE><TIME>|<HOST>|I|main
    5252    Following should generate an error messgae
    53 <DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
     53<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
    5454    Specified operation, yarg, is not supported.
    5555<DATE><TIME>|<HOST>|I|main
    5656    Following should generate an error message
    57 <DATE><TIME>|<HOST>|E|psUnaryOp (psMatrixVectorArithmetic.c:<LINENO>)
     57<DATE><TIME>|<HOST>|E|psUnaryOp (FILE:LINENO)
    5858    Specified operation, yarg, is not supported.
    5959<DATE><TIME>|<HOST>|I|main
    6060    Following should generate an error message
    61 <DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
     61<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
    6262    Unallowable operation: input1 has incorrect dimensionality.
    6363<DATE><TIME>|<HOST>|I|main
    6464    Following should generate an error message
    65 <DATE><TIME>|<HOST>|E|psUnaryOp (psMatrixVectorArithmetic.c:<LINENO>)
     65<DATE><TIME>|<HOST>|E|psUnaryOp (FILE:LINENO)
    6666    Specified parameter, in, has invalid dimensionality, 4.
  • trunk/psLib/test/dataManip/verified/tst_psMinimize04.stderr

    r2288 r3127  
    11<DATE><TIME>|<HOST>|I|t03
    22    Following should generate an error for null input polynomial.
    3 <DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (psMinimize.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (FILE:LINENO)
    44    Unallowable operation: polynomial myPoly or its coeffs is NULL.
  • trunk/psLib/test/dataManip/verified/tst_psMinimize04_F32.stderr

    r3115 r3127  
    11<DATE><TIME>|<HOST>|I|t03
    22    Following should generate an error for null input polynomial.
    3 <DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (psMinimize.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (FILE:LINENO)
    44    Unallowable operation: polynomial myPoly or its coeffs is NULL.
  • trunk/psLib/test/dataManip/verified/tst_psMinimize04b.stderr

    r2740 r3127  
    11<DATE><TIME>|<HOST>|I|t03
    22    Following should generate an error for null arguments.
    3 <DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (psMinimize.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (FILE:LINENO)
    44    Unallowable operation: polynomial myPoly or its coeffs is NULL.
  • trunk/psLib/test/dataManip/verified/tst_psMinimize04b_F32.stderr

    r3115 r3127  
    11<DATE><TIME>|<HOST>|I|t03
    22    Following should generate an error for null arguments.
    3 <DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (psMinimize.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (FILE:LINENO)
    44    Unallowable operation: polynomial myPoly or its coeffs is NULL.
  • trunk/psLib/test/dataManip/verified/tst_psMinimize05.stderr

    r2743 r3127  
    11<DATE><TIME>|<HOST>|I|t02
    22    Following should generate error for null minimize.
    3 <DATE><TIME>|<HOST>|E|psMinimizePowell (psMinimize.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psMinimizePowell (FILE:LINENO)
    44    Unallowable operation: min is NULL.
    55<DATE><TIME>|<HOST>|I|t02
    66    Following should generate error for null parameter vector
    7 <DATE><TIME>|<HOST>|E|psMinimizePowell (psMinimize.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psMinimizePowell (FILE:LINENO)
    88    Unallowable operation: psVector params or its data is NULL.
    99<DATE><TIME>|<HOST>|I|t02
    1010    Following should generate error for null coords.
    11 <DATE><TIME>|<HOST>|E|psMinimizePowell (psMinimize.c:<LINENO>)
     11<DATE><TIME>|<HOST>|E|psMinimizePowell (FILE:LINENO)
    1212    Unallowable operation: coords is NULL.
    1313<DATE><TIME>|<HOST>|I|t02
    1414    Following should generate error for null function
    15 <DATE><TIME>|<HOST>|E|psMinimizePowell (psMinimize.c:<LINENO>)
     15<DATE><TIME>|<HOST>|E|psMinimizePowell (FILE:LINENO)
    1616    Unallowable operation: func is NULL.
  • trunk/psLib/test/dataManip/verified/tst_psRandom.stderr

    r3012 r3127  
    11<DATE><TIME>|<HOST>|I|t00
    22    Invalid type, should generate error message
    3 <DATE><TIME>|<HOST>|E|psRandomAlloc (psRandom.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psRandomAlloc (FILE:LINENO)
    44    Unknown Random Number Generator Type
    55<DATE><TIME>|<HOST>|I|t01
    66    NULL psRandom variable, should generate error message
    7 <DATE><TIME>|<HOST>|E|psRandomUniform (psRandom.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psRandomUniform (FILE:LINENO)
    88    Random variable is NULL.
    99<DATE><TIME>|<HOST>|I|t02
    1010    NULL psRandom variable, should generate error message
    11 <DATE><TIME>|<HOST>|E|psRandomGaussian (psRandom.c:<LINENO>)
     11<DATE><TIME>|<HOST>|E|psRandomGaussian (FILE:LINENO)
    1212    Random variable is NULL.
    1313<DATE><TIME>|<HOST>|I|t03
    1414    NULL psRandom variable, should generate error message
    15 <DATE><TIME>|<HOST>|E|psRandomPoisson (psRandom.c:<LINENO>)
     15<DATE><TIME>|<HOST>|E|psRandomPoisson (FILE:LINENO)
    1616    Random variable is NULL.
    1717<DATE><TIME>|<HOST>|I|t04
    1818    Reset a NULL psRandom variable, should generate an error message
    19 <DATE><TIME>|<HOST>|E|psRandomReset (psRandom.c:<LINENO>)
     19<DATE><TIME>|<HOST>|E|psRandomReset (FILE:LINENO)
    2020    Random variable is NULL.
  • trunk/psLib/test/dataManip/verified/tst_psStats00.stderr

    r2723 r3127  
    11<DATE><TIME>|<HOST>|I|main
    22    Following should generate an error message.
    3 <DATE><TIME>|<HOST>|E|psVectorStats (psStats.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psVectorStats (FILE:LINENO)
    44    Unallowable operation: psVector in or its data is NULL.
    55<DATE><TIME>|<HOST>|I|main
    66    Following should generate an error message.
    7 <DATE><TIME>|<HOST>|E|psVectorStats (psStats.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psVectorStats (FILE:LINENO)
    88    Unallowable operation: stats is NULL.
  • trunk/psLib/test/dataManip/verified/tst_psVectorFFT.stderr

    r2713 r3127  
    77<DATE><TIME>|<HOST>|I|testVectorFFT
    88    Following should generate an error message.
    9 <DATE><TIME>|<HOST>|E|psVectorFFT (psVectorFFT.c:<LINENO>)
     9<DATE><TIME>|<HOST>|E|psVectorFFT (FILE:LINENO)
    1010    Must specify the direction as either PS_FFT_FORWARD or PS_FFT_REVERSE.
    1111
     
    3737<DATE><TIME>|<HOST>|I|testVectorComplex
    3838    Following should be an error (type mismatch).
    39 <DATE><TIME>|<HOST>|E|psVectorComplex (psVectorFFT.c:<LINENO>)
     39<DATE><TIME>|<HOST>|E|psVectorComplex (FILE:LINENO)
    4040    Real psVector type, psF32, and imaginary psVector type, psF64, must be the same.
    4141<DATE><TIME>|<HOST>|I|testVectorComplex
    4242    Following should generate an error message.
    43 <DATE><TIME>|<HOST>|E|psVectorComplex (psVectorFFT.c:<LINENO>)
     43<DATE><TIME>|<HOST>|E|psVectorComplex (FILE:LINENO)
    4444    Input psVector type, psS8, is required to be either psF32 or psF64.
    4545
     
    6767<DATE><TIME>|<HOST>|I|testVectorPowerSpectrum
    6868    Following should generate an error message.
    69 <DATE><TIME>|<HOST>|E|psVectorPowerSpectrum (psVectorFFT.c:<LINENO>)
     69<DATE><TIME>|<HOST>|E|psVectorPowerSpectrum (FILE:LINENO)
    7070    Input psVector type, psF32, is required to be either psC32 or psC64.
    7171
  • trunk/psLib/test/fileUtils/Makefile.am

    r3115 r3127  
    1 #Makefile for astronomy functions of psLib
     1#Makefile for fileUtils functions of psLib
    22#
     3EXTRA_DIST = verified
     4
    35INCLUDES = \
    46        -I$(top_srcdir)/src \
     
    1113        $(all_includes)
    1214
    13 AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
     15AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
    1416
    1517check_PROGRAMS = \
     
    1719        tst_psFits
    1820
    19 TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest
     21TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
    2022TESTS = \
    2123        tst_psLookupTable_01 \
  • trunk/psLib/test/fileUtils/verified/tst_psFits.stderr

    r3028 r3127  
    1616<DATE><TIME>|<HOST>|I|tst_psFitsMoveExtName
    1717    Following should be an error.
    18 <DATE><TIME>|<HOST>|E|psFitsMoveExtName (psFits.c:<LINENO>)
     18<DATE><TIME>|<HOST>|E|psFitsMoveExtName (FILE:LINENO)
    1919    Could not find HDU 'bogus' in file multi.fits.
    2020    CFITSIO Error: illegal HDU number
    2121<DATE><TIME>|<HOST>|I|tst_psFitsMoveExtName
    2222    Following should be an error.
    23 <DATE><TIME>|<HOST>|E|psFitsMoveExtName (psFits.c:<LINENO>)
     23<DATE><TIME>|<HOST>|E|psFitsMoveExtName (FILE:LINENO)
    2424    The input psFits object can not NULL.
    2525<DATE><TIME>|<HOST>|I|tst_psFitsMoveExtName
    2626    Following should be an error.
    27 <DATE><TIME>|<HOST>|E|psFitsMoveExtName (psFits.c:<LINENO>)
     27<DATE><TIME>|<HOST>|E|psFitsMoveExtName (FILE:LINENO)
    2828    Specified extension name can not be NULL.
    2929
     
    3838<DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
    3939    Following should be an error.
    40 <DATE><TIME>|<HOST>|E|psFitsGetSize (psFits.c:<LINENO>)
     40<DATE><TIME>|<HOST>|E|psFitsGetSize (FILE:LINENO)
    4141    The input psFits object can not NULL.
    4242<DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
    4343    Following should be an error.
    44 <DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
     44<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
    4545    Could not move to specified HDU #-1 in file multi.fits.
    4646    CFITSIO Error: illegal HDU number
    4747<DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
    4848    Following should be an error.
    49 <DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
     49<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
    5050    Could not move -1 HDUs from current position in file multi.fits.
    5151    CFITSIO Error: illegal HDU number
    5252<DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
    5353    Following should be an error.
    54 <DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
     54<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
    5555    Could not move to specified HDU #8 in file multi.fits.
    5656    CFITSIO Error: tried to move past end of file
    5757<DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
    5858    Following should be an error.
    59 <DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
     59<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
    6060    Could not move 1 HDUs from current position in file multi.fits.
    6161    CFITSIO Error: tried to move past end of file
    6262<DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
    6363    Following should be an error.
    64 <DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
     64<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
    6565    The input psFits object can not NULL.
    6666
     
    7575<DATE><TIME>|<HOST>|I|tst_psFitsReadHeader
    7676    following should be an error (input psFits = NULL)
    77 <DATE><TIME>|<HOST>|E|psFitsReadHeader (psFits.c:<LINENO>)
     77<DATE><TIME>|<HOST>|E|psFitsReadHeader (FILE:LINENO)
    7878    The input psFits object can not NULL.
    7979
     
    8686\**********************************************************************************/
    8787
    88 <DATE><TIME>|<HOST>|E|psFitsReadHeaderSet (psFits.c:<LINENO>)
     88<DATE><TIME>|<HOST>|E|psFitsReadHeaderSet (FILE:LINENO)
    8989    The input psFits object can not NULL.
    9090
     
    9797\**********************************************************************************/
    9898
    99 <DATE><TIME>|<HOST>|E|psFitsReadTable (psFits.c:<LINENO>)
     99<DATE><TIME>|<HOST>|E|psFitsReadTable (FILE:LINENO)
    100100    The input psFits object can not NULL.
    101101
     
    119119<DATE><TIME>|<HOST>|I|testImageWrite
    120120    Following should generate an error message because input image is null.
    121 <DATE><TIME>|<HOST>|E|psFitsWriteImage (psFits.c:<LINENO>)
     121<DATE><TIME>|<HOST>|E|psFitsWriteImage (FILE:LINENO)
    122122    The input psImage was NULL.  Need a non-NULL psImage for operation to be performed.
    123123
  • trunk/psLib/test/image/Makefile.am

    r3115 r3127  
    1 #Makefile for astronomy functions of psLib
     1#Makefile for image functions of psLib
    22#
     3EXTRA_DIST = verified
     4
    35INCLUDES = \
    46        -I$(top_srcdir)/src \
     
    1113        $(all_includes)
    1214
    13 AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
     15AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
    1416
    1517check_PROGRAMS = \
     
    2729        tst_psImageInterpolate
    2830
    29 TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest
     31TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
    3032TESTS = \
    3133        tst_psImage \
  • trunk/psLib/test/image/verified/tst_psImage.stderr

    r2879 r3127  
    1111<DATE><TIME>|<HOST>|I|testImageAlloc
    1212    Following should be an error.
    13 <DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     13<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
    1414    Specified number of rows (0) or columns (0) is invalid.
    1515<DATE><TIME>|<HOST>|I|testImageAlloc
     
    1717<DATE><TIME>|<HOST>|I|testImageAlloc
    1818    Following should be an error.
    19 <DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     19<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
    2020    Specified number of rows (0) or columns (0) is invalid.
    2121<DATE><TIME>|<HOST>|I|testImageAlloc
     
    2323<DATE><TIME>|<HOST>|I|testImageAlloc
    2424    Following should be an error.
    25 <DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     25<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
    2626    Specified number of rows (0) or columns (0) is invalid.
    2727<DATE><TIME>|<HOST>|I|testImageAlloc
     
    2929<DATE><TIME>|<HOST>|I|testImageAlloc
    3030    Following should be an error.
    31 <DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     31<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
    3232    Specified number of rows (0) or columns (0) is invalid.
    3333<DATE><TIME>|<HOST>|I|testImageAlloc
     
    3535<DATE><TIME>|<HOST>|I|testImageAlloc
    3636    Following should be an error.
    37 <DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     37<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
    3838    Specified number of rows (0) or columns (0) is invalid.
    3939<DATE><TIME>|<HOST>|I|testImageAlloc
     
    4141<DATE><TIME>|<HOST>|I|testImageAlloc
    4242    Following should be an error.
    43 <DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     43<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
    4444    Specified number of rows (0) or columns (0) is invalid.
    4545<DATE><TIME>|<HOST>|I|testImageAlloc
     
    4747<DATE><TIME>|<HOST>|I|testImageAlloc
    4848    Following should be an error.
    49 <DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     49<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
    5050    Specified number of rows (0) or columns (0) is invalid.
    5151<DATE><TIME>|<HOST>|I|testImageAlloc
     
    5353<DATE><TIME>|<HOST>|I|testImageAlloc
    5454    Following should be an error.
    55 <DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     55<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
    5656    Specified number of rows (0) or columns (0) is invalid.
    5757<DATE><TIME>|<HOST>|I|testImageAlloc
     
    5959<DATE><TIME>|<HOST>|I|testImageAlloc
    6060    Following should be an error.
    61 <DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     61<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
    6262    Specified number of rows (0) or columns (0) is invalid.
    6363<DATE><TIME>|<HOST>|I|testImageAlloc
     
    6565<DATE><TIME>|<HOST>|I|testImageAlloc
    6666    Following should be an error.
    67 <DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     67<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
    6868    Specified number of rows (0) or columns (0) is invalid.
    6969<DATE><TIME>|<HOST>|I|testImageAlloc
     
    7171<DATE><TIME>|<HOST>|I|testImageAlloc
    7272    Following should be an error.
    73 <DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     73<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
    7474    Specified number of rows (0) or columns (0) is invalid.
    7575<DATE><TIME>|<HOST>|I|testImageAlloc
     
    7777<DATE><TIME>|<HOST>|I|testImageAlloc
    7878    Following should be an error.
    79 <DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     79<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
    8080    Specified number of rows (0) or columns (0) is invalid.
    8181<DATE><TIME>|<HOST>|I|testImageAlloc
     
    8383<DATE><TIME>|<HOST>|I|testImageAlloc
    8484    Following should be an error.
    85 <DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     85<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
    8686    Specified number of rows (0) or columns (0) is invalid.
    8787
     
    112112<DATE><TIME>|<HOST>|I|testImageCopy
    113113    An error should follow...
    114 <DATE><TIME>|<HOST>|E|psImageCopy (psImage.c:<LINENO>)
     114<DATE><TIME>|<HOST>|E|psImageCopy (FILE:LINENO)
    115115    Can not operate on a NULL psImage.
    116116
     
    123123\**********************************************************************************/
    124124
    125 <DATE><TIME>|<HOST>|E|psRegionFromString (psImage.c:<LINENO>)
    126     Specified subsection string, '[1:<LINENO>,3:]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
     125<DATE><TIME>|<HOST>|E|psRegionFromString (FILE:LINENO)
     126    Specified subsection string, '[1:2,3:]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
    127127
    128128---> TESTPOINT PASSED (psImage{psRegionAlloc} | tst_psImage.c)
  • trunk/psLib/test/image/verified/tst_psImageConvolve.stderr

    r2911 r3127  
    2424<DATE><TIME>|<HOST>|I|testKernelGenerate
    2525    Following should be an error.
    26 <DATE><TIME>|<HOST>|E|psKernelGenerate (psImageConvolve.c:<LINENO>)
     26<DATE><TIME>|<HOST>|E|psKernelGenerate (FILE:LINENO)
    2727    Shift vectors can not be of different sizes.
    2828<DATE><TIME>|<HOST>|I|testKernelGenerate
    2929    Following should be a error (time vector NULL).
    30 <DATE><TIME>|<HOST>|E|psKernelGenerate (psImageConvolve.c:<LINENO>)
     30<DATE><TIME>|<HOST>|E|psKernelGenerate (FILE:LINENO)
    3131    Specified shift vectors can not be NULL.
    3232<DATE><TIME>|<HOST>|I|testKernelGenerate
    3333    Following should be a error (x vector NULL).
    34 <DATE><TIME>|<HOST>|E|psKernelGenerate (psImageConvolve.c:<LINENO>)
     34<DATE><TIME>|<HOST>|E|psKernelGenerate (FILE:LINENO)
    3535    Specified shift vectors can not be NULL.
    3636<DATE><TIME>|<HOST>|I|testKernelGenerate
    3737    Following should be a error (y vector NULL).
    38 <DATE><TIME>|<HOST>|E|psKernelGenerate (psImageConvolve.c:<LINENO>)
     38<DATE><TIME>|<HOST>|E|psKernelGenerate (FILE:LINENO)
    3939    Specified shift vectors can not be NULL.
    4040
  • trunk/psLib/test/image/verified/tst_psImageExtraction.stderr

    r2279 r3127  
    2323<DATE><TIME>|<HOST>|I|testImageSubset
    2424    An error should follow...
    25 <DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
     25<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
    2626    Can not operate on a NULL psImage.
    2727<DATE><TIME>|<HOST>|I|testImageSubset
     
    2929<DATE><TIME>|<HOST>|I|testImageSubset
    3030    An error should follow...
    31 <DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
    32     Specified subset range, [0:<LINENO>,128:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    33 <DATE><TIME>|<HOST>|I|testImageSubset
    34     An error should follow...
    35 <DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
    36     Specified subset range, [64:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
     31<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
     32    Specified subset range, [0:63,128:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
     33<DATE><TIME>|<HOST>|I|testImageSubset
     34    An error should follow...
     35<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
     36    Specified subset range, [64:63,0:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
    3737<DATE><TIME>|<HOST>|I|testImageSubset
    3838    Verify the returned psImage structure pointer is null and program execution doesn't stop, if the input parameters row0 and col0 are not within the range of values of psImage structure image.
    3939<DATE><TIME>|<HOST>|I|testImageSubset
    4040    An error should follow...
    41 <DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
    42     Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    43 <DATE><TIME>|<HOST>|I|testImageSubset
    44     An error should follow...
    45 <DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
    46     Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    47 <DATE><TIME>|<HOST>|I|testImageSubset
    48     An error should follow...
    49 <DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
    50     Specified subset range, [-1:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    51 <DATE><TIME>|<HOST>|I|testImageSubset
    52     An error should follow...
    53 <DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
    54     Specified subset range, [0:<LINENO>,-1:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
     41<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
     42    Specified subset range, [0:63,0:511], is invalid or outside input psImage's boundaries, [0:127,0:255].
     43<DATE><TIME>|<HOST>|I|testImageSubset
     44    An error should follow...
     45<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
     46    Specified subset range, [0:255,0:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
     47<DATE><TIME>|<HOST>|I|testImageSubset
     48    An error should follow...
     49<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
     50    Specified subset range, [-1:63,0:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
     51<DATE><TIME>|<HOST>|I|testImageSubset
     52    An error should follow...
     53<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
     54    Specified subset range, [0:63,-1:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
    5555<DATE><TIME>|<HOST>|I|testImageSubset
    5656    Verify the returned psImage structure pointer is null and program execution doesn't stop if the input parameters nrow, ncol, row0 and col0 specify a range of data not within the input psImage structure image.  Also verify the input psImage structure is not modified.
    5757<DATE><TIME>|<HOST>|I|testImageSubset
    5858    An error should follow...
    59 <DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
    60     Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    61 <DATE><TIME>|<HOST>|I|testImageSubset
    62     An error should follow...
    63 <DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
    64     Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    65 <DATE><TIME>|<HOST>|I|testImageSubset
    66     An error should follow...
    67 <DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
    68     Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
     59<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
     60    Specified subset range, [0:63,0:256], is invalid or outside input psImage's boundaries, [0:127,0:255].
     61<DATE><TIME>|<HOST>|I|testImageSubset
     62    An error should follow...
     63<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
     64    Specified subset range, [0:128,0:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
     65<DATE><TIME>|<HOST>|I|testImageSubset
     66    An error should follow...
     67<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
     68    Specified subset range, [0:128,0:256], is invalid or outside input psImage's boundaries, [0:127,0:255].
    6969<DATE><TIME>|<HOST>|I|testImageSubset
    7070    psImageFreeChildren shall deallocate any children images of a psImage structure
     
    7979
    8080<DATE><TIME>|<HOST>|I|testImageSubsection
    81     Testing subsection [0:<LINENO>,0:<LINENO>].
    82 <DATE><TIME>|<HOST>|I|testImageSubsection
    83     Testing subsection [32:<LINENO>,32:<LINENO>].
    84 <DATE><TIME>|<HOST>|I|testImageSubsection
    85     Testing subsection [64:<LINENO>,32:<LINENO>].
    86 <DATE><TIME>|<HOST>|I|testImageSubsection
    87     Testing subsection [32:<LINENO>,128:<LINENO>].
     81    Testing subsection [0:32,0:32].
     82<DATE><TIME>|<HOST>|I|testImageSubsection
     83    Testing subsection [32:64,32:64].
     84<DATE><TIME>|<HOST>|I|testImageSubsection
     85    Testing subsection [64:127,32:64].
     86<DATE><TIME>|<HOST>|I|testImageSubsection
     87    Testing subsection [32:64,128:255].
    8888<DATE><TIME>|<HOST>|I|testImageSubsection
    8989    An error should follow (x1>x2)
    90 <DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
    91     Specified subset range, [64:<LINENO>,32:<LINENO>], is invalid.  Ranges must be incremental.
     90<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
     91    Specified subset range, [64:32,32:64], is invalid.  Ranges must be incremental.
    9292<DATE><TIME>|<HOST>|I|testImageSubsection
    9393    An error should follow (y1>y2)
    94 <DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
    95     Specified subset range, [32:<LINENO>,64:<LINENO>], is invalid.  Ranges must be incremental.
     94<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
     95    Specified subset range, [32:64,64:32], is invalid.  Ranges must be incremental.
    9696<DATE><TIME>|<HOST>|I|testImageSubsection
    9797    An error should follow (x2>nCols)
    98 <DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
    99     Specified subset range, [64:<LINENO>,32:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
     98<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
     99    Specified subset range, [64:256,32:64], is invalid or outside input psImage's boundaries, [0:127,0:255].
    100100<DATE><TIME>|<HOST>|I|testImageSubsection
    101101    An error should follow (y2>=nRows)
    102 <DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
    103     Specified subset range, [32:<LINENO>,64:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
     102<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
     103    Specified subset range, [32:64,64:256], is invalid or outside input psImage's boundaries, [0:127,0:255].
    104104<DATE><TIME>|<HOST>|I|testImageSubsection
    105105    An error should follow (malformed string - no brackets)
    106 <DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
    107     Specified subsection string, '32:<LINENO>,32:<LINENO>', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
     106<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
     107    Specified subsection string, '32:64,32:64', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
    108108<DATE><TIME>|<HOST>|I|testImageSubsection
    109109    An error should follow (malformed string - no colons)
    110 <DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
     110<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
    111111    Specified subsection string, '[32-64,32-64]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
    112112<DATE><TIME>|<HOST>|I|testImageSubsection
    113113    An error should follow (malformed string - not four numbers)
    114 <DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
    115     Specified subsection string, '[32:<LINENO>,32]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
     114<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
     115    Specified subsection string, '[32:64,32]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
    116116<DATE><TIME>|<HOST>|I|testImageSubsection
    117117    An error should follow (image is NULL)
    118 <DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
     118<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
    119119    Can not operate on a NULL psImage.
    120120<DATE><TIME>|<HOST>|I|testImageSubsection
    121121    An error should follow (subsection string is NULL)
    122 <DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
     122<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
    123123    Specified subsection string can not be NULL.
    124124
     
    133133<DATE><TIME>|<HOST>|I|testImageSlice
    134134    Following should be an error.
    135 <DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
    136     Can not operate on a NULL psImage.
    137 <DATE><TIME>|<HOST>|I|testImageSlice
    138     Following should be an error.
    139 <DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
     135<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     136    Can not operate on a NULL psImage.
     137<DATE><TIME>|<HOST>|I|testImageSlice
     138    Following should be an error.
     139<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
    140140    Specified statistic can not be NULL.
    141141<DATE><TIME>|<HOST>|I|testImageSlice
    142142    Following should be an error.
    143 <DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
     143<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
    144144    Specified slice direction, 5, is invalid.
    145145<DATE><TIME>|<HOST>|I|testImageSlice
    146146    Following should be an error.
    147 <DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
    148     Specified subset range, [30:<LINENO>,20:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    149 <DATE><TIME>|<HOST>|I|testImageSlice
    150     Following should be an error.
    151 <DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
    152     Specified subset range, [301:<LINENO>,20:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    153 <DATE><TIME>|<HOST>|I|testImageSlice
    154     Following should be an error.
    155 <DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
    156     Specified subset range, [30:<LINENO>,201:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    157 <DATE><TIME>|<HOST>|I|testImageSlice
    158     Following should be an error.
    159 <DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
    160     Specified subset range, [30:<LINENO>,20:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    161 <DATE><TIME>|<HOST>|I|testImageSlice
    162     Following should be an error.
    163 <DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
    164     Specified subset range, [30:<LINENO>,20:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    165 <DATE><TIME>|<HOST>|I|testImageSlice
    166     Following should be an error.
    167 <DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
     147<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     148    Specified subset range, [30:30,20:20], is invalid or outside input psImage's boundaries, [0:300,0:200].
     149<DATE><TIME>|<HOST>|I|testImageSlice
     150    Following should be an error.
     151<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     152    Specified subset range, [301:302,20:30], is invalid or outside input psImage's boundaries, [0:300,0:200].
     153<DATE><TIME>|<HOST>|I|testImageSlice
     154    Following should be an error.
     155<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     156    Specified subset range, [30:31,201:205], is invalid or outside input psImage's boundaries, [0:300,0:200].
     157<DATE><TIME>|<HOST>|I|testImageSlice
     158    Following should be an error.
     159<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     160    Specified subset range, [30:301,20:21], is invalid or outside input psImage's boundaries, [0:300,0:200].
     161<DATE><TIME>|<HOST>|I|testImageSlice
     162    Following should be an error.
     163<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     164    Specified subset range, [30:31,20:201], is invalid or outside input psImage's boundaries, [0:300,0:200].
     165<DATE><TIME>|<HOST>|I|testImageSlice
     166    Following should be an error.
     167<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
    168168    Specified statistic option, 0, is not valid.  Must specify one and only one statistic type.
    169169<DATE><TIME>|<HOST>|I|testImageSlice
    170170    Following should be an error mask size != image size.
    171 <DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
     171<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
    172172    Input psImage mask size, 200x300, does not match psImage input size, 300x200.
    173173<DATE><TIME>|<HOST>|I|testImageSlice
    174174    Following should be an error invalid mask type.
    175 <DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
     175<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
    176176    Input psImage mask type, psS8, is not the supported mask datatype of psU8.
    177177<DATE><TIME>|<HOST>|I|testImageSlice
    178178    Following should be an error invalid image type.
    179 <DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
     179<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
    180180    Specified psImage type, psU8, is not supported.
    181181
     
    188188\**********************************************************************************/
    189189
    190 <DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
    191     Can not operate on a NULL psImage.
    192 <DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
    193     Specified subset range, [-1:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    194 <DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
    195     Specified subset range, [0:<LINENO>,-1:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    196 <DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
    197     Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    198 <DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
    199     Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    200 <DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
    201     Specified subset range, [0:-1,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    202 <DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
    203     Specified subset range, [0:<LINENO>,0:-1], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
     190<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
     191    Can not operate on a NULL psImage.
     192<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
     193    Specified subset range, [-1:299,0:199], is invalid or outside input psImage's boundaries, [0:299,0:199].
     194<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
     195    Specified subset range, [0:299,-1:199], is invalid or outside input psImage's boundaries, [0:299,0:199].
     196<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
     197    Specified subset range, [0:300,0:199], is invalid or outside input psImage's boundaries, [0:299,0:199].
     198<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
     199    Specified subset range, [0:299,0:200], is invalid or outside input psImage's boundaries, [0:299,0:199].
     200<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
     201    Specified subset range, [0:-1,0:199], is invalid or outside input psImage's boundaries, [0:299,0:199].
     202<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
     203    Specified subset range, [0:299,0:-1], is invalid or outside input psImage's boundaries, [0:299,0:199].
    204204
    205205---> TESTPOINT PASSED (psImage{psImageTrim} | tst_psImageExtraction.c)
     
    213213<DATE><TIME>|<HOST>|I|testImageCut
    214214    The following should be an error.
    215 <DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
    216     Specified line, (-1.000000,10.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    217 <DATE><TIME>|<HOST>|I|testImageCut
    218     The following should be an error.
    219 <DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
    220     Specified line, (300.000000,10.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    221 <DATE><TIME>|<HOST>|I|testImageCut
    222     The following should be an error.
    223 <DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
    224     Specified line, (20.000000,10.000000)->(-1.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    225 <DATE><TIME>|<HOST>|I|testImageCut
    226     The following should be an error.
    227 <DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
    228     Specified line, (20.000000,10.000000)->(300.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    229 <DATE><TIME>|<HOST>|I|testImageCut
    230     The following should be an error.
    231 <DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
    232     Specified line, (20.000000,-1.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    233 <DATE><TIME>|<HOST>|I|testImageCut
    234     The following should be an error.
    235 <DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
    236     Specified line, (20.000000,200.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    237 <DATE><TIME>|<HOST>|I|testImageCut
    238     The following should be an error.
    239 <DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
    240     Specified line, (20.000000,10.000000)->(240.000000,-1.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
    241 <DATE><TIME>|<HOST>|I|testImageCut
    242     The following should be an error.
    243 <DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
    244     Specified line, (20.000000,10.000000)->(240.000000,200.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
     215<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
     216    Specified line, (-1.000000,10.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
     217<DATE><TIME>|<HOST>|I|testImageCut
     218    The following should be an error.
     219<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
     220    Specified line, (300.000000,10.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
     221<DATE><TIME>|<HOST>|I|testImageCut
     222    The following should be an error.
     223<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
     224    Specified line, (20.000000,10.000000)->(-1.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
     225<DATE><TIME>|<HOST>|I|testImageCut
     226    The following should be an error.
     227<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
     228    Specified line, (20.000000,10.000000)->(300.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
     229<DATE><TIME>|<HOST>|I|testImageCut
     230    The following should be an error.
     231<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
     232    Specified line, (20.000000,-1.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
     233<DATE><TIME>|<HOST>|I|testImageCut
     234    The following should be an error.
     235<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
     236    Specified line, (20.000000,200.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
     237<DATE><TIME>|<HOST>|I|testImageCut
     238    The following should be an error.
     239<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
     240    Specified line, (20.000000,10.000000)->(240.000000,-1.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
     241<DATE><TIME>|<HOST>|I|testImageCut
     242    The following should be an error.
     243<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
     244    Specified line, (20.000000,10.000000)->(240.000000,200.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
    245245<DATE><TIME>|<HOST>|I|testImageCut
    246246    Following should be an error (NULL image).
    247 <DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
     247<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
    248248    Can not operate on a NULL psImage.
    249249<DATE><TIME>|<HOST>|I|testImageCut
    250250    Following should be an error (length=0).
    251 <DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
     251<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
    252252    Specified number of samples, 0, must be greater than 1 to make a line.
    253253
     
    262262<DATE><TIME>|<HOST>|I|testImageRadialCut
    263263    Following should be an error.
    264 <DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
    265     Can not operate on a NULL psImage.
    266 <DATE><TIME>|<HOST>|I|testImageRadialCut
    267     Following should be an error.
    268 <DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
     264<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
     265    Can not operate on a NULL psImage.
     266<DATE><TIME>|<HOST>|I|testImageRadialCut
     267    Following should be an error.
     268<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
    269269    Specified radii vector can not be NULL.
    270270<DATE><TIME>|<HOST>|I|testImageRadialCut
    271271    Following should be an error.
    272 <DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
     272<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
    273273    Specified statistic can not be NULL.
    274274<DATE><TIME>|<HOST>|I|testImageRadialCut
    275275    Following should be an error.
    276 <DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
    277     Specified center, (301,100), is outside of the psImage boundaries, [0:<LINENO>,0:<LINENO>].
    278 <DATE><TIME>|<HOST>|I|testImageRadialCut
    279     Following should be an error.
    280 <DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
    281     Specified center, (150,201), is outside of the psImage boundaries, [0:<LINENO>,0:<LINENO>].
    282 <DATE><TIME>|<HOST>|I|testImageRadialCut
    283     Following should be an error.
    284 <DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
     276<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
     277    Specified center, (301,100), is outside of the psImage boundaries, [0:299,0:199].
     278<DATE><TIME>|<HOST>|I|testImageRadialCut
     279    Following should be an error.
     280<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
     281    Specified center, (150,201), is outside of the psImage boundaries, [0:299,0:199].
     282<DATE><TIME>|<HOST>|I|testImageRadialCut
     283    Following should be an error.
     284<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
    285285    Input psImage mask type, psF32, is not the supported mask datatype of psU8.
    286286<DATE><TIME>|<HOST>|I|testImageRadialCut
    287287    Following should be an error.
    288 <DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
     288<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
    289289    Input psImage mask size, 150x100, does not match psImage input size, 300x200.
    290290<DATE><TIME>|<HOST>|I|testImageRadialCut
    291291    Following should be an error.
    292 <DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
     292<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
    293293    Input radii vector size, 1, can not be less than 2.
    294294<DATE><TIME>|<HOST>|I|testImageRadialCut
    295295    Following should be an error.
    296 <DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
     296<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
    297297    Specified statistic option, 0, is not valid.  Must specify one and only one statistic type.
    298298
  • trunk/psLib/test/image/verified/tst_psImageFFT.stderr

    r2714 r3127  
    77<DATE><TIME>|<HOST>|I|testImageFFT
    88    Following should be an error.
    9 <DATE><TIME>|<HOST>|E|psImageFFT (psImageFFT.c:<LINENO>)
     9<DATE><TIME>|<HOST>|E|psImageFFT (FILE:LINENO)
    1010    Can not specify both PS_FFT_FORWARD and PS_FFT_REVERSE options.
    1111<DATE><TIME>|<HOST>|I|testImageFFT
    1212    Following should be an error.
    13 <DATE><TIME>|<HOST>|E|psImageFFT (psImageFFT.c:<LINENO>)
     13<DATE><TIME>|<HOST>|E|psImageFFT (FILE:LINENO)
    1414    The PS_FFT_FORWARD and PS_FFT_REAL_RESULT combinition is not supported.
    1515<DATE><TIME>|<HOST>|I|testImageFFT
    1616    Following should generate error for invalid direction.
    17 <DATE><TIME>|<HOST>|E|psImageFFT (psImageFFT.c:<LINENO>)
     17<DATE><TIME>|<HOST>|E|psImageFFT (FILE:LINENO)
    1818    Must specify either PS_FFT_FORWARD or PS_FFT_REVERSE option.
    1919
     
    3737<DATE><TIME>|<HOST>|I|testImageComplex
    3838    Following should be an error (type mismatch).
    39 <DATE><TIME>|<HOST>|E|psImageComplex (psImageFFT.c:<LINENO>)
     39<DATE><TIME>|<HOST>|E|psImageComplex (FILE:LINENO)
    4040    Real psImage type (psF32) and imaginary psImage type (psF64) must be the same.
    4141<DATE><TIME>|<HOST>|I|testImageComplex
    4242    Following should be an error (size mismatch).
    43 <DATE><TIME>|<HOST>|E|psImageComplex (psImageFFT.c:<LINENO>)
     43<DATE><TIME>|<HOST>|E|psImageComplex (FILE:LINENO)
    4444    Real psImage size (128x64) and imaginary psImage size (64x64) must be the same.
    4545<DATE><TIME>|<HOST>|I|testImageComplex
    4646    Following should generate an error message.
    47 <DATE><TIME>|<HOST>|E|psImageComplex (psImageFFT.c:<LINENO>)
     47<DATE><TIME>|<HOST>|E|psImageComplex (FILE:LINENO)
    4848    Input psImage type, psS16, is required to be either psF32 or psF64.
    4949
     
    6767<DATE><TIME>|<HOST>|I|testImagePowerSpectrum
    6868    Following should generate error message.
    69 <DATE><TIME>|<HOST>|E|psImagePowerSpectrum (psImageFFT.c:<LINENO>)
     69<DATE><TIME>|<HOST>|E|psImagePowerSpectrum (FILE:LINENO)
    7070    Input psImage type, psF32, is required to be either psC32 or psC64.
    7171
  • trunk/psLib/test/image/verified/tst_psImageIO.stderr

    r2976 r3127  
    329329<DATE><TIME>|<HOST>|W|psImageReadSection
    330330    psImageReadSection is deprecated.  Consider using psFitsReadImage instead.
    331 <DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
     331<DATE><TIME>|<HOST>|E|psImageReadSection (FILE:LINENO)
    332332    Could not open file,'foobar.fits'.
    333333    CFITSIO Error: could not open the named file
     
    336336<DATE><TIME>|<HOST>|W|psImageReadSection
    337337    psImageReadSection is deprecated.  Consider using psFitsReadImage instead.
    338 <DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
     338<DATE><TIME>|<HOST>|E|psImageReadSection (FILE:LINENO)
    339339    Specified filename can not be NULL.
    340340<DATE><TIME>|<HOST>|I|testImageRead
     
    342342<DATE><TIME>|<HOST>|W|psImageReadSection
    343343    psImageReadSection is deprecated.  Consider using psFitsReadImage instead.
    344 <DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
     344<DATE><TIME>|<HOST>|E|psImageReadSection (FILE:LINENO)
    345345    Could not find HDU #4 in file tmpImages/MxN_F32.fits.
    346346    CFITSIO Error: tried to move past end of file
     
    349349<DATE><TIME>|<HOST>|W|psImageReadSection
    350350    psImageReadSection is deprecated.  Consider using psFitsReadImage instead.
    351 <DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
     351<DATE><TIME>|<HOST>|E|psImageReadSection (FILE:LINENO)
    352352    Could not find HDU with extension name 'bogus' in file tmpImages/MxN_F32.fits.
    353353    CFITSIO Error: illegal HDU number
     
    371371<DATE><TIME>|<HOST>|W|psImageWriteSection
    372372    psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
    373 <DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
     373<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
    374374    Can not operate on a NULL psImage.
    375375<DATE><TIME>|<HOST>|I|testImageWrite
     
    377377<DATE><TIME>|<HOST>|W|psImageWriteSection
    378378    psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
    379 <DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
     379<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
    380380    Could not create file,'panstarrs/writeFits.fits'.
    381381    CFITSIO Error: couldn't create the named file
     
    384384<DATE><TIME>|<HOST>|W|psImageWriteSection
    385385    psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
    386 <DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
     386<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
    387387    Could not open file,'tmpImages/writeInvalidFile.fits'.
    388388    CFITSIO Error: tried to move past end of file
     
    391391<DATE><TIME>|<HOST>|W|psImageWriteSection
    392392    psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
    393 <DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
     393<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
    394394    Could not find HDU with extension name 'ext2' in file tmpImages/writeTest.fits.
    395395    CFITSIO Error: illegal HDU number
     
    398398<DATE><TIME>|<HOST>|W|psImageWriteSection
    399399    psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
    400 <DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
     400<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
    401401    Specified extension number, 99, must not exceed number of HDUs, 1, by more than one.
    402402
  • trunk/psLib/test/image/verified/tst_psImageInterpolate.stderr

    r2758 r3127  
    1616<DATE><TIME>|<HOST>|I|testInterpolateError
    1717    Following should generate an error message
    18 <DATE><TIME>|<HOST>|E|psImagePixelInterpolate (psImage.c:<LINENO>)
     18<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (FILE:LINENO)
    1919    Can not operate on a NULL psImage.
    2020<DATE><TIME>|<HOST>|I|testInterpolateError
    2121    Following should generate an error message
    22 <DATE><TIME>|<HOST>|E|psImagePixelInterpolate (psImage.c:<LINENO>)
     22<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (FILE:LINENO)
    2323    Specified psImage type, psPtr, is not supported.
    2424<DATE><TIME>|<HOST>|I|testInterpolateError
    2525    Following should generate an error message
    26 <DATE><TIME>|<HOST>|E|psImagePixelInterpolate (psImage.c:<LINENO>)
     26<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (FILE:LINENO)
    2727    Specified psImage type, psPtr, is not supported.
    2828
  • trunk/psLib/test/image/verified/tst_psImageManip.stderr

    r3028 r3127  
    2727<DATE><TIME>|<HOST>|I|testImageClip
    2828    Following should be an error (max<min)
    29 <DATE><TIME>|<HOST>|E|psImageClip (psImageManip.c:<LINENO>)
     29<DATE><TIME>|<HOST>|E|psImageClip (FILE:LINENO)
    3030    Specified min value, 256, can not be greater than the specified max value, 128.
    3131
     
    4242<DATE><TIME>|<HOST>|I|testImageClipNAN
    4343    Following should be an error (invalid type)
    44 <DATE><TIME>|<HOST>|E|psImageClipNaN (psImageManip.c:<LINENO>)
     44<DATE><TIME>|<HOST>|E|psImageClipNaN (FILE:LINENO)
    4545    Specified psImage type, psS32, is not supported.
    4646
     
    6161<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
    6262    Following should be an error:
    63 <DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
    64     Can not operate on a NULL psImage.
    65 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
    66     Following should be an error:
    67 <DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
     63<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
     64    Can not operate on a NULL psImage.
     65<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     66    Following should be an error:
     67<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
    6868    Specified real-portion of min value, 10, can not be greater than the real-portion of max value, 5.
    6969<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
    7070    Following should be an error:
    71 <DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
     71<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
    7272    Specified imaginary-portion of min value, 10, can not be greater than the imaginary-portion of max value, 5.
    7373<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
    7474    Following should be an error:
    75 <DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
     75<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
    7676    Specified real-portion of min value, 10, can not be greater than the real-portion of max value, 5.
    7777<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
    7878    Following should be an error:
    79 <DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
    80     Specified vmin value, -6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
    81 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
    82     Following should be an error:
    83 <DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
    84     Specified vmin value, 6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
    85 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
    86     Following should be an error:
    87 <DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
    88     Specified vmin value, -0-6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
    89 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
    90     Following should be an error:
    91 <DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
    92     Specified vmin value, 0+6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
    93 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
    94     Following should be an error:
    95 <DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
    96     Specified vmax value, -6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
    97 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
    98     Following should be an error:
    99 <DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
    100     Specified vmax value, 6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
    101 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
    102     Following should be an error:
    103 <DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
    104     Specified vmax value, -0-6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
    105 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
    106     Following should be an error:
    107 <DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
    108     Specified vmax value, 0+6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
     79<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
     80    Specified vmin value, -6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
     81<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     82    Following should be an error:
     83<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
     84    Specified vmin value, 6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
     85<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     86    Following should be an error:
     87<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
     88    Specified vmin value, -0-6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
     89<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     90    Following should be an error:
     91<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
     92    Specified vmin value, 0+6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
     93<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     94    Following should be an error:
     95<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
     96    Specified vmax value, -6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
     97<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     98    Following should be an error:
     99<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
     100    Specified vmax value, 6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
     101<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     102    Following should be an error:
     103<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
     104    Specified vmax value, -0-6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
     105<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     106    Following should be an error:
     107<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
     108    Specified vmax value, 0+6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
    109109<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
    110110    Following should be an error (invalid type)
    111 <DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
     111<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
    112112    Specified psImage type, psS32, is not supported.
    113113
     
    122122<DATE><TIME>|<HOST>|I|testImageOverlay
    123123    Following should error as overlay isn't within image boundaries
    124 <DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
    125     Specified subset range, [32:<LINENO>,64:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
     124<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
     125    Specified subset range, [32:160,64:320], is invalid or outside input psImage's boundaries, [0:128,0:256].
    126126<DATE><TIME>|<HOST>|I|testImageOverlay
    127127    Following should error as overlay is NULL
    128 <DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
     128<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
    129129    Can not operate on a NULL psImage.
    130130<DATE><TIME>|<HOST>|I|testImageOverlay
    131131    Following should error as image input is NULL
    132 <DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
     132<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
    133133    Can not operate on a NULL psImage.
    134134<DATE><TIME>|<HOST>|I|testImageOverlay
    135135    Following should error as operator is invalid
    136 <DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
     136<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
    137137    Specified operation, '$', is not supported.
    138138<DATE><TIME>|<HOST>|I|testImageOverlay
    139139    Following should error as operator is invalid
    140 <DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
     140<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
    141141    Operation can not be NULL.
    142142<DATE><TIME>|<HOST>|I|testImageOverlay
    143143    Following should error as overlay is a different type
    144 <DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
     144<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
    145145    Input overlay psImage type, psS64, must match input psImage type, psF32.
    146146
     
    155155<DATE><TIME>|<HOST>|I|testImageRebin
    156156    Following should be an error for unsupported type.
    157 <DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
     157<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
    158158    Specified psImage type, psU8, is not supported.
    159159<DATE><TIME>|<HOST>|I|testImageRebin
    160160    Following should be an error for invallid mask type.
    161 <DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
     161<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
    162162    Input psImage mask type, psF32, is not the supported mask datatype of psU8.
    163 <DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
     163<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
    164164    Can not operate on a NULL psImage.
    165165<DATE><TIME>|<HOST>|I|testImageRebin
    166166    Following should be an error for scale < 0.
    167 <DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
     167<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
    168168    Specified scale value, 0, must be a positive value.
    169169<DATE><TIME>|<HOST>|I|testImageRebin
    170170    Following should be an error for stats null.
    171 <DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
     171<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
    172172    Specified statistic can not be NULL.
    173173<DATE><TIME>|<HOST>|I|testImageRebin
    174174    Following should be an error for stats options 0.
    175 <DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
     175<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
    176176    Specified statistic option, 0, is not valid.  Must specify one and only one statistic type.
    177177<DATE><TIME>|<HOST>|I|testImageRebin
    178178    Following should be an error for stat options use range.
    179 <DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
     179<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
    180180    Specified statistic option, 8192, is not valid.  Must specify one and only one statistic type.
    181181<DATE><TIME>|<HOST>|I|testImageRebin
    182182    Following should be an error for stats with multiple options.
    183 <DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
     183<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
    184184    Specified statistic option, 2049, is not valid.  Must specify one and only one statistic type.
    185185
     
    194194<DATE><TIME>|<HOST>|I|testImageRoll
    195195    Following should generate an error.
    196 <DATE><TIME>|<HOST>|E|psImageRoll (psImageManip.c:<LINENO>)
     196<DATE><TIME>|<HOST>|E|psImageRoll (FILE:LINENO)
    197197    Can not operate on a NULL psImage.
    198198
     
    351351<DATE><TIME>|<HOST>|I|testImageRotate
    352352    Following should be an error
    353 <DATE><TIME>|<HOST>|E|psImageRotate (psImageManip.c:<LINENO>)
     353<DATE><TIME>|<HOST>|E|psImageRotate (FILE:LINENO)
    354354    Can not operate on a NULL psImage.
    355355<DATE><TIME>|<HOST>|I|testImageRotate
    356356    Following should be an error for invalid interpolation type.
    357 <DATE><TIME>|<HOST>|E|psImageRotate (psImageManip.c:<LINENO>)
     357<DATE><TIME>|<HOST>|E|psImageRotate (FILE:LINENO)
    358358    Specified interpolation mode, -1, is unsupported.
    359359
     
    402402<DATE><TIME>|<HOST>|I|testImageShift
    403403    Following should be an error...
    404 <DATE><TIME>|<HOST>|E|psImageShift (psImageManip.c:<LINENO>)
     404<DATE><TIME>|<HOST>|E|psImageShift (FILE:LINENO)
    405405    Can not operate on a NULL psImage.
    406406<DATE><TIME>|<HOST>|I|testImageShift
    407407    Following should be an error for invalid interpolation mode.
    408 <DATE><TIME>|<HOST>|E|psImageShift (psImageManip.c:<LINENO>)
     408<DATE><TIME>|<HOST>|E|psImageShift (FILE:LINENO)
    409409    Specified interpolation mode, -1, is unsupported.
    410410
     
    417417\**********************************************************************************/
    418418
    419 <DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
    420     Can not operate on a NULL psImage.
    421 <DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
     419<DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
     420    Can not operate on a NULL psImage.
     421<DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
    422422    Specified scale value, 0, must be a positive value.
    423 <DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
     423<DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
    424424    Specified interpolation mode, 0, is unsupported.
    425 <DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
     425<DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
    426426    Specified psImage type, psPtr, is not supported.
    427427
  • trunk/psLib/test/image/verified/tst_psImageStats00.stderr

    r2733 r3127  
    1 <DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
     1<DATE><TIME>|<HOST>|E|psImageHistogram (FILE:LINENO)
    22    Unallowable operation: out is NULL.
    3 <DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psImageHistogram (FILE:LINENO)
    44    Unallowable operation: in is NULL.
    5 <DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
     5<DATE><TIME>|<HOST>|E|psImageHistogram (FILE:LINENO)
    66    Unallowable operation: out is NULL.
    77<DATE><TIME>|<HOST>|I|main
    88    Following should be an error for invalid mask type.
    9 <DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
     9<DATE><TIME>|<HOST>|E|psImageHistogram (FILE:LINENO)
    1010    Unallowable operation: psImage mask has incorrect type.
  • trunk/psLib/test/image/verified/tst_psImageStats01.stderr

    r2734 r3127  
    1 <DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
     1<DATE><TIME>|<HOST>|E|psImageStats (FILE:LINENO)
    22    Error: stats->options is 0.
    3 <DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psImageStats (FILE:LINENO)
    44    Unallowable operation: stats is NULL.
    5 <DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
     5<DATE><TIME>|<HOST>|E|psImageStats (FILE:LINENO)
    66    Error: stats->options is 0.
    7 <DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psImageStats (FILE:LINENO)
    88    Unallowable operation: psImage mask has incorrect type.
  • trunk/psLib/test/image/verified/tst_psImageStats02.stderr

    r2279 r3127  
    11<DATE><TIME>|<HOST>|I|main
    22    Following should be an error message for NULL coeffs argument.
    3 <DATE><TIME>|<HOST>|E|psImageFitPolynomial (psImageStats.c:<LINENO>)
     3<DATE><TIME>|<HOST>|E|psImageFitPolynomial (FILE:LINENO)
    44    Unallowable operation: polynomial coeffs or its coeffs is NULL.
    55<DATE><TIME>|<HOST>|I|main
    66    Following should be a error message for NULL input argument.
    7 <DATE><TIME>|<HOST>|E|psImageFitPolynomial (psImageStats.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|psImageFitPolynomial (FILE:LINENO)
    88    Unallowable operation: psImage input or its data is NULL.
    99<DATE><TIME>|<HOST>|I|main
    1010    Following should be an error message for NULL coeffs argument.
    11 <DATE><TIME>|<HOST>|E|psImageEvalPolynomial (psImageStats.c:<LINENO>)
     11<DATE><TIME>|<HOST>|E|psImageEvalPolynomial (FILE:LINENO)
    1212    Unallowable operation: polynomial coeffs or its coeffs is NULL.
    1313<DATE><TIME>|<HOST>|I|main
    1414    Following should be a error message for NULL input argument.
    15 <DATE><TIME>|<HOST>|E|psImageEvalPolynomial (psImageStats.c:<LINENO>)
     15<DATE><TIME>|<HOST>|E|psImageEvalPolynomial (FILE:LINENO)
    1616    Unallowable operation: psImage input or its data is NULL.
  • trunk/psLib/test/runTest

    r3115 r3127  
    2828#
    2929#  $Revison:  $  $Name: not supported by cvs2svn $
    30 #  $Date: 2005-02-03 00:54:12 $
     30#  $Date: 2005-02-04 22:49:37 $
    3131#
    3232#  Copyright 2004 Maui High Performance Computering Center, University of Hawaii
     
    3636# Provides functions for handling psS64 command line options
    3737use Getopt::Long;
     38
     39$verifiedDir = "verified";
    3840
    3941# Assign variables based on the presence of command line options to the script
     
    4244    "resetStderr!" => \$resetStderr,
    4345    "resetStdout!" => \$resetStdout,
     46    "verified=s"   => \$verifiedDir,
    4447    "help!"        => \$help
    4548);
     
    8386
    8487    # Check if a verified directory exists in the current work directory
    85     if ( !( -e "verified" ) ) {
     88    if ( !( -e $verifiedDir ) ) {
    8689
    8790        # Display message that verified subdirectory doesn't exist
     
    133136            # Open mod file to place filtered STDOUT
    134137            open( MODFILE,  "> temp/$testFile.stdout.mod" );
    135             open( MODFILE2, "> verified/$testFile.stdout" ) if $resetStdout;
     138            open( MODFILE2, "> $verifiedDir/$testFile.stdout" ) if $resetStdout;
    136139
    137140           # Replace the variable date, time and host information with constants
     
    143146                s/$hostname\s*/<HOST>/g;
    144147                s/: Line \d+/: Line <LINENO>/g;
    145                 s/\:\d+/\:<LINENO>/g;
     148                s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
    146149                s/allocate \d+ bytes at/allocate <N> bytes at/g;
    147150
     
    166169            # Open mod file to place filtered STDERR
    167170            open( MODFILE,  "> temp/$testFile.stderr.mod" );
    168             open( MODFILE2, "> verified/$testFile.stderr" ) if $resetStderr;
     171            open( MODFILE2, "> $verifiedDir/$testFile.stderr" ) if $resetStderr;
    169172
    170173           # Replace the variable date, time and host information with constants
     
    174177                s/$hostname\s*/<HOST>/g;
    175178                s/: Line \d+/: Line <LINENO>/g;
    176                 s/\:\d+/\:<LINENO>/g;
     179                s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
    177180                s/allocate \d+ bytes at/allocate <N> bytes at/g;
    178181
     
    193196
    194197            # Compare STDOUT capture with verified file
    195             $exitValue |= &compareStream("verified/$testFile.stdout");
     198            $exitValue |= &compareStream("$verifiedDir/$testFile.stdout");
    196199
    197200            # Check exit value to determine if verified file doesn't exist
     
    204207
    205208            # Compare STDERR capture with verified file
    206             $exitValue |= &compareStream("verified/$testFile.stderr");
     209            $exitValue |= &compareStream("$verifiedDir/$testFile.stderr");
    207210
    208211            # Check exit value to determine if verified file doesn't exist
     
    330333        # Create name of the temp file to compare
    331334        $tempFile = $streamFile;
    332         $tempFile =~ s/verified/temp/;
     335        $tempFile =~ s/$verifiedDir/temp/;
    333336        $tempFile = $tempFile . ".mod";
    334337
  • trunk/psLib/test/sysUtils/Makefile.am

    r3115 r3127  
    1 #Makefile for astronomy functions of psLib
     1#Makefile for sysUtils functions of psLib
    22#
     3EXTRA_DIST = verified
     4
    35INCLUDES = \
    46        -I$(top_srcdir)/src \
     
    1113        $(all_includes)
    1214
    13 AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
     15AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
    1416
    1517check_PROGRAMS = \
     
    2224        tst_psConfigure
    2325
    24 TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest
     26TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
    2527TESTS = \
    2628        tst_psAbort      \
  • trunk/psLib/test/sysUtils/verified/tst_psError.stderr

    r2280 r3127  
    55\**********************************************************************************/
    66
    7 <DATE><TIME>|<HOST>|E|testError00 (tst_psError.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|testError00 (FILE:LINENO)
    88    ALL TYPES intval = 1 longval = 2 floatval = 3.010000 charval = E strval = E R R O R
    9 <DATE><TIME>|<HOST>|E|testError00 (tst_psError.c:<LINENO>)
     9<DATE><TIME>|<HOST>|E|testError00 (FILE:LINENO)
    1010    NO VALUES
    11 <DATE><TIME>|<HOST>|E|testError00 (tst_psError.c:<LINENO>)
     11<DATE><TIME>|<HOST>|E|testError00 (FILE:LINENO)
    1212
    1313---> TESTPOINT PASSED (psError{psError()} | tst_psError.c)
     
    1919\**********************************************************************************/
    2020
    21 <DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
     21<DATE><TIME>|<HOST>|E|testError01 (FILE:LINENO)
    2222    Error code = 262
    23 ERROR STACK PRINT Test1A -> testError01 (tst_psError.c:<LINENO>): parameter is out-of-range
     23ERROR STACK PRINT Test1A -> testError01 (FILE:LINENO): parameter is out-of-range
    2424     Error code = 262
    25 <DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
     25<DATE><TIME>|<HOST>|E|testError01 (FILE:LINENO)
    2626    Error code = 263
    27 ERROR STACK PRINT Test1B -> testError01 (tst_psError.c:<LINENO>): parameter is of unsupported type
     27ERROR STACK PRINT Test1B -> testError01 (FILE:LINENO): parameter is of unsupported type
    2828     Error code = 263
    29 <DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
     29<DATE><TIME>|<HOST>|E|testError01 (FILE:LINENO)
    3030    Error code = -1
    31 ERROR STACK PRINT Test1D -> testError01 (tst_psError.c:<LINENO>): (null)
     31ERROR STACK PRINT Test1D -> testError01 (FILE:LINENO): (null)
    3232     Error code = -1
    33 <DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
     33<DATE><TIME>|<HOST>|E|testError01 (FILE:LINENO)
    3434    Error code = 262
    35 ERROR STACK PRINT Test1E -> testError01 (tst_psError.c:<LINENO>): (null)
     35ERROR STACK PRINT Test1E -> testError01 (FILE:LINENO): (null)
    3636     Error code = -1
    37  -> testError01 (tst_psError.c:<LINENO>): parameter is out-of-range
     37 -> testError01 (FILE:LINENO): parameter is out-of-range
    3838     Error code = 262
    39 <DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
     39<DATE><TIME>|<HOST>|E|testError01 (FILE:LINENO)
    4040    Errno code = 9
    41 ERROR STACK PRINT Test1F -> testError01 (tst_psError.c:<LINENO>): Bad file descriptor
     41ERROR STACK PRINT Test1F -> testError01 (FILE:LINENO): Bad file descriptor
    4242     Errno code = 9
    4343
     
    5050\**********************************************************************************/
    5151
    52 <DATE><TIME>|<HOST>|E|testError02 (tst_psError.c:<LINENO>)
     52<DATE><TIME>|<HOST>|E|testError02 (FILE:LINENO)
    5353    Error code = 262
    54 ERROR STACK PRINT Test2A -> testError02 (tst_psError.c:<LINENO>): parameter is out-of-range
     54ERROR STACK PRINT Test2A -> testError02 (FILE:LINENO): parameter is out-of-range
    5555     Error code = 262
    5656
     
    6363\**********************************************************************************/
    6464
    65 <DATE><TIME>|<HOST>|E|testError03 (tst_psError.c:<LINENO>)
     65<DATE><TIME>|<HOST>|E|testError03 (FILE:LINENO)
    6666    Error code = 262
    67 <DATE><TIME>|<HOST>|E|testError03 (tst_psError.c:<LINENO>)
     67<DATE><TIME>|<HOST>|E|testError03 (FILE:LINENO)
    6868    Error code = 263
    69 <DATE><TIME>|<HOST>|E|testError03 (tst_psError.c:<LINENO>)
     69<DATE><TIME>|<HOST>|E|testError03 (FILE:LINENO)
    7070    Error code = 264
    7171
     
    7878\**********************************************************************************/
    7979
    80 <DATE><TIME>|<HOST>|E|testError04 (tst_psError.c:<LINENO>)
     80<DATE><TIME>|<HOST>|E|testError04 (FILE:LINENO)
    8181    Error code = 262
    82 <DATE><TIME>|<HOST>|E|testError04 (tst_psError.c:<LINENO>)
     82<DATE><TIME>|<HOST>|E|testError04 (FILE:LINENO)
    8383    Error code = 263
    84 <DATE><TIME>|<HOST>|E|testError04 (tst_psError.c:<LINENO>)
     84<DATE><TIME>|<HOST>|E|testError04 (FILE:LINENO)
    8585    Error code = 264
    8686
     
    106106<DATE><TIME>|<HOST>|I|testErrorRegister
    107107    Following should be an error.
    108 <DATE><TIME>|<HOST>|E|psErrorRegister (psErrorCodes.c:<LINENO>)
     108<DATE><TIME>|<HOST>|E|psErrorRegister (FILE:LINENO)
    109109    Specified psErrorDescription pointer can not be NULL.
    110110
  • trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr

    r2703 r3127  
    2121    Custom MemExhaustedCallback was invoked.
    2222<DATE><TIME>|<HOST>|A|p_psAlloc
    23     Failed to allocate <N> bytes at tst_psMemory.c:<LINENO>
     23    Failed to allocate <N> bytes at tst_psMemory.c:206
    2424
    2525---> TESTPOINT PASSED (psMemory{outOfMemory} | tst_psMemory.c)
     
    3636    Custom MemExhaustedCallback was invoked.
    3737<DATE><TIME>|<HOST>|A|p_psRealloc
    38     Failed to reallocate <N> bytes at tst_psMemory.c:<LINENO>
     38    Failed to reallocate <N> bytes at tst_psMemory.c:171
    3939
    4040---> TESTPOINT PASSED (psMemory{reallocOutOfMemory} | tst_psMemory.c)
     
    9191    following psMemCheckLeaks call should produce one instance.
    9292                   file:line ID
    93          tst_psMemory.c:<LINENO>  1
     93         tst_psMemory.c:356  1
    9494<DATE><TIME>|<HOST>|I|TPcheckLeaks
    9595    Testing psMemCheckLeaks again with a different leak location
     
    9797    following psMemCheckLeaks call should produce one error.
    9898                   file:line ID
    99          tst_psMemory.c:<LINENO>  11
     99         tst_psMemory.c:386  11
    100100<DATE><TIME>|<HOST>|I|TPcheckLeaks
    101101    Testing psMemCheckLeaks again with multiple leak locations.
     
    103103    following psMemCheckLeaks call should produce two errors.
    104104                   file:line ID
    105          tst_psMemory.c:<LINENO>  16
    106          tst_psMemory.c:<LINENO>  14
     105         tst_psMemory.c:414  16
     106         tst_psMemory.c:414  14
    107107
    108108---> TESTPOINT PASSED (psMemory{checkLeaks} | tst_psMemory.c)
     
    118118<DATE><TIME>|<HOST>|I|TPmemCorruption
    119119    psMemCheckCorruption should output an error message and memProblemCallback callback should be called.
    120 <DATE><TIME>|<HOST>|E|checkMemBlock (psMemory.c:<LINENO>)
     120<DATE><TIME>|<HOST>|E|checkMemBlock (FILE:LINENO)
    121121    Memory block 1 is corrupted; buffer underflow detected.
    122122<DATE><TIME>|<HOST>|I|memProblemCallback
    123     memory callback called for id 1 (psMemCheckCorruption:<LINENO>).
     123    memory callback called for id 1 (FILE:LINENO).
    124124
    125125---> TESTPOINT PASSED (psMemory{psMemCorruption} | tst_psMemory.c)
     
    147147    Next should abort due to multiple freeing.
    148148<DATE><TIME>|<HOST>|A|p_psFree
    149     Block 1, allocated at tst_psMemory.c:<LINENO>, freed multiple times at tst_psMemory.c:<LINENO>.
     149    Block 1, allocated at tst_psMemory.c:526, freed multiple times at tst_psMemory.c:531.
    150150
    151151---> TESTPOINT PASSED (psMemory{multipleFree} | tst_psMemory.c)
  • trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr

    r2280 r3127  
    5050\**********************************************************************************/
    5151
    52 <DATE><TIME>|<HOST>|E|psStringNCopy (psString.c:<LINENO>)
     52<DATE><TIME>|<HOST>|E|psStringNCopy (FILE:LINENO)
    5353    Can not copy a negative number of characters (-5).
    5454
Note: See TracChangeset for help on using the changeset viewer.