IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 3623


Ignore:
Timestamp:
Apr 1, 2005, 10:11:19 AM (21 years ago)
Author:
desonia
Message:

updated the testing platform to match psLib, enabling the use of 'make check'.

Location:
trunk/psModules
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/Makefile.am

    r1888 r3623  
    22
    33SUBDIRS = src test
     4
     5test: check

  • trunk/psModules/config.guess

    r3579 r3623  
    22# Attempt to guess a canonical system name.
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    4 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    5 
    6 timestamp='2003-06-17'
     4#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
     5
     6timestamp='2004-08-11'
    77
    88# This file is free software; you can redistribute it and/or modify it
    … …  
    5454
    5555Originally written by Per Bothner.
    56 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
     56Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
    5757Free Software Foundation, Inc.
    5858
    … …  
    137137UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
    138138
    139 ## for Red Hat Linux
    140 if test -f /etc/redhat-release ; then
    141     VENDOR=redhat ;
    142 else
    143     VENDOR= ;
    144 fi
     139case "${UNAME_MACHINE}" in
     140    i?86)
     141        test -z "$VENDOR" && VENDOR=pc
     142        ;;
     143    *)
     144        test -z "$VENDOR" && VENDOR=unknown
     145        ;;
     146esac
     147test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
    145148
    146149# Note: order is significant - the case branches are not exclusive.
    … …  
    205208        echo "${machine}-${os}${release}"
    206209        exit 0 ;;
     210    amd64:OpenBSD:*:*)
     211        echo x86_64-unknown-openbsd${UNAME_RELEASE}
     212        exit 0 ;;
    207213    amiga:OpenBSD:*:*)
    208214        echo m68k-unknown-openbsd${UNAME_RELEASE}
    … …  
    211217        echo mipsel-unknown-openbsd${UNAME_RELEASE}
    212218        exit 0 ;;
     219    cats:OpenBSD:*:*)
     220        echo arm-unknown-openbsd${UNAME_RELEASE}
     221        exit 0 ;;
    213222    hp300:OpenBSD:*:*)
    214223        echo m68k-unknown-openbsd${UNAME_RELEASE}
    215224        exit 0 ;;
     225    luna88k:OpenBSD:*:*)
     226        echo m88k-unknown-openbsd${UNAME_RELEASE}
     227        exit 0 ;;
    216228    mac68k:OpenBSD:*:*)
    217229        echo m68k-unknown-openbsd${UNAME_RELEASE}
    … …  
    244256        echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
    245257        exit 0 ;;
     258    *:ekkoBSD:*:*)
     259        echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
     260        exit 0 ;;
     261    macppc:MirBSD:*:*)
     262        echo powerppc-unknown-mirbsd${UNAME_RELEASE}
     263        exit 0 ;;
     264    *:MirBSD:*:*)
     265        echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
     266        exit 0 ;;
    246267    alpha:OSF1:*:*)
    247         if test $UNAME_RELEASE = "V4.0"; then
     268        case $UNAME_RELEASE in
     269        *4.0)
    248270                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
    249         fi
     271                ;;
     272        *5.*)
     273                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
     274                ;;
     275        esac
    250276        # According to Compaq, /usr/sbin/psrinfo has been available on
    251277        # OSF/1 and Tru64 systems produced since 1995.  I hope that
    … …  
    285311                UNAME_MACHINE="alphaev79" ;;
    286312        esac
     313        # A Pn.n version is a patched version.
    287314        # A Vn.n version is a released version.
    288315        # A Tn.n version is a released field test version.
    289316        # A Xn.n version is an unreleased experimental baselevel.
    290317        # 1.2 uses "1.2" for uname -r.
    291         echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
    292         exit 0 ;;
    293     Alpha*:OpenVMS:*:*)
    294         echo alpha-hp-vms
     318        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
    295319        exit 0 ;;
    296320    Alpha\ *:Windows_NT*:*)
    … …  
    314338    *:OS/390:*:*)
    315339        echo i370-ibm-openedition
     340        exit 0 ;;
     341    *:OS400:*:*)
     342        echo powerpc-ibm-os400
    316343        exit 0 ;;
    317344    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
    … …  
    407434        echo m68k-unknown-mint${UNAME_RELEASE}
    408435        exit 0 ;;
     436    m68k:machten:*:*)
     437        echo m68k-apple-machten${UNAME_RELEASE}
     438        exit 0 ;;
    409439    powerpc:machten:*:*)
    410440        echo powerpc-apple-machten${UNAME_RELEASE}
    … …  
    742772        exit 0 ;;
    743773    *:UNICOS/mp:*:*)
    744         echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
     774        echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
    745775        exit 0 ;;
    746776    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
    … …  
    750780        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
    751781        exit 0 ;;
     782    5000:UNIX_System_V:4.*:*)
     783        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
     784        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
     785        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
     786        exit 0 ;;
    752787    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
    753788        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
    … …  
    759794        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
    760795        exit 0 ;;
    761     *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
    762         # Determine whether the default compiler uses glibc.
    763         eval $set_cc_for_build
    764         sed 's/^        //' << EOF >$dummy.c
    765         #include <features.h>
    766         #if __GLIBC__ >= 2
    767         LIBC=gnu
    768         #else
    769         LIBC=
    770         #endif
    771 EOF
    772         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
    773         echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
     796    *:FreeBSD:*:*)
     797        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
    774798        exit 0 ;;
    775799    i*:CYGWIN*:*)
    … …  
    804828        exit 0 ;;
    805829    *:GNU:*:*)
     830        # the GNU system
    806831        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
     832        exit 0 ;;
     833    *:GNU/*:*:*)
     834        # other systems with GNU libc and userland
     835        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
    807836        exit 0 ;;
    808837    i*86:Minix:*:*)
    … …  
    810839        exit 0 ;;
    811840    arm*:Linux:*:*)
    812         echo ${UNAME_MACHINE}-unknown-linux-gnu
     841        echo ${UNAME_MACHINE}-${VENDOR}-linux
    813842        exit 0 ;;
    814843    cris:Linux:*:*)
    815         echo cris-axis-linux-gnu
     844        echo cris-axis-linux
    816845        exit 0 ;;
    817846    ia64:Linux:*:*)
    818         echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu
     847        echo ${UNAME_MACHINE}-${VENDOR}-linux
     848        exit 0 ;;
     849    m32r*:Linux:*:*)
     850        echo ${UNAME_MACHINE}-${VENDOR}-linux
    819851        exit 0 ;;
    820852    m68*:Linux:*:*)
    821         echo ${UNAME_MACHINE}-unknown-linux-gnu
     853        echo ${UNAME_MACHINE}-${VENDOR}-linux
    822854        exit 0 ;;
    823855    mips:Linux:*:*)
    … …  
    838870EOF
    839871        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
    840         test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
     872        test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
    841873        ;;
    842874    mips64:Linux:*:*)
    … …  
    857889EOF
    858890        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
    859         test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
     891        test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
    860892        ;;
    861893    ppc:Linux:*:*)
    862         echo powerpc-${VENDOR:-unknown}-linux-gnu
     894        echo powerpc-${VENDOR}-linux
    863895        exit 0 ;;
    864896    ppc64:Linux:*:*)
    865         echo powerpc64-${VENDOR:-unknown}-linux-gnu
     897        echo powerpc64-${VENDOR}-linux
    866898        exit 0 ;;
    867899    alpha:Linux:*:*)
    … …  
    876908        esac
    877909        objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
    878         if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
    879         echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
     910        if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi
     911        echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
    880912        exit 0 ;;
    881913    parisc:Linux:*:* | hppa:Linux:*:*)
    882914        # Look for CPU level
    883915        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
    884           PA7*) echo hppa1.1-unknown-linux-gnu ;;
    885           PA8*) echo hppa2.0-unknown-linux-gnu ;;
    886           *)    echo hppa-unknown-linux-gnu ;;
     916          PA7*) echo hppa1.1-${VENDOR}-linux ;;
     917          PA8*) echo hppa2.0-${VENDOR}-linux ;;
     918          *)    echo hppa-${VENDOR}-linux ;;
    887919        esac
    888920        exit 0 ;;
    889921    parisc64:Linux:*:* | hppa64:Linux:*:*)
    890         echo hppa64-unknown-linux-gnu
     922        echo hppa64-${VENDOR}-linux
    891923        exit 0 ;;
    892924    s390:Linux:*:* | s390x:Linux:*:*)
    893         echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu
     925        echo ${UNAME_MACHINE}-ibm-linux
    894926        exit 0 ;;
    895927    sh64*:Linux:*:*)
    896         echo ${UNAME_MACHINE}-unknown-linux-gnu
     928        echo ${UNAME_MACHINE}-${VENDOR}-linux
    897929        exit 0 ;;
    898930    sh*:Linux:*:*)
    899         echo ${UNAME_MACHINE}-unknown-linux-gnu
     931        echo ${UNAME_MACHINE}-${VENDOR}-linux
    900932        exit 0 ;;
    901933    sparc:Linux:*:* | sparc64:Linux:*:*)
    902         echo ${UNAME_MACHINE}-unknown-linux-gnu
     934        echo ${UNAME_MACHINE}-${VENDOR}-linux
    903935        exit 0 ;;
    904936    x86_64:Linux:*:*)
    905         echo x86_64-${VENDOR:-unknown}-linux-gnu
     937        echo x86_64-${VENDOR}-linux
    906938        exit 0 ;;
    907939    i*86:Linux:*:*)
    … …  
    918950        case "$ld_supported_targets" in
    919951          elf32-i386)
    920                 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
     952                TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
    921953                ;;
    922954          a.out-i386-linux)
    923                 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
     955                echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
    924956                exit 0 ;;
    925957          coff-i386)
    926                 echo "${UNAME_MACHINE}-pc-linux-gnucoff"
     958                echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
    927959                exit 0 ;;
    928960          "")
    929                 # Either a pre-BFD a.out linker (linux-gnuoldld) or
     961                # Either a pre-BFD a.out linker (linuxoldld) or
    930962                # one that does not give us useful --help.
    931                 echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
     963                echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
    932964                exit 0 ;;
    933965        esac
    … …  
    953985        #endif
    954986        #endif
     987        #ifdef __dietlibc__
     988        LIBC=dietlibc
     989        #endif
    955990EOF
    956991        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
    957         test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0
     992        test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0
    958993        test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
    959994        ;;
    … …  
    9821017    i*86:atheos:*:*)
    9831018        echo ${UNAME_MACHINE}-unknown-atheos
     1019        exit 0 ;;
     1020        i*86:syllable:*:*)
     1021        echo ${UNAME_MACHINE}-pc-syllable
    9841022        exit 0 ;;
    9851023    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
    … …  
    10521090        echo m68k-diab-dnix
    10531091        exit 0 ;;
    1054     M68*:*:R3V[567]*:*)
     1092    M68*:*:R3V[5678]*:*)
    10551093        test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
    1056     3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
     1094    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
    10571095        OS_REL=''
    10581096        test -r /etc/.relid \
    … …  
    11521190        exit 0 ;;
    11531191    *:Darwin:*:*)
    1154         case `uname -p` in
     1192        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
     1193        case $UNAME_PROCESSOR in
    11551194            *86) UNAME_PROCESSOR=i686 ;;
    1156             powerpc) UNAME_PROCESSOR=powerpc ;;
     1195            unknown) UNAME_PROCESSOR=powerpc ;;
    11571196        esac
    11581197        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
    … …  
    11691208        echo i386-pc-qnx
    11701209        exit 0 ;;
    1171     NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
     1210    NSR-?:NONSTOP_KERNEL:*:*)
    11721211        echo nsr-tandem-nsk${UNAME_RELEASE}
    11731212        exit 0 ;;
    … …  
    12131252        echo mips-sei-seiux${UNAME_RELEASE}
    12141253        exit 0 ;;
     1254    *:DragonFly:*:*)
     1255        echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
     1256        exit 0 ;;
     1257    *:*VMS:*:*)
     1258        UNAME_MACHINE=`(uname -p) 2>/dev/null`
     1259        case "${UNAME_MACHINE}" in
     1260            A*) echo alpha-dec-vms && exit 0 ;;
     1261            I*) echo ia64-dec-vms && exit 0 ;;
     1262            V*) echo vax-dec-vms && exit 0 ;;
     1263        esac
    12151264esac
    12161265

  • trunk/psModules/config.sub

    r3579 r3623  
    22# Configuration validation subroutine script.
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    4 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    5 
    6 timestamp='2003-06-18'
     4#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
     5
     6timestamp='2004-06-24'
    77
    88# This file is (in principle) common to ALL GNU software.
    … …  
    7171GNU config.sub ($timestamp)
    7272
    73 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
     73Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
    7474Free Software Foundation, Inc.
    7575
    … …  
    119119maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
    120120case $maybe_os in
    121   nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     121  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
     122  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
    122123    os=-$maybe_os
    123124    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    … …  
    145146        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
    146147        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
    147         -apple | -axis)
     148        -apple | -axis | -knuth | -cray)
    148149                os=
    149150                basic_machine=$1
    … …  
    229230        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
    230231        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
     232        | am33_2.0 \
    231233        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
    232234        | c4x | clipper \
    … …  
    235237        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
    236238        | i370 | i860 | i960 | ia64 \
    237         | ip2k \
    238         | m32r | m68000 | m68k | m88k | mcore \
     239        | ip2k | iq2000 \
     240        | m32r | m32rle | m68000 | m68k | m88k | mcore \
    239241        | mips | mipsbe | mipseb | mipsel | mipsle \
    240242        | mips16 \
    … …  
    248250        | mipsisa32r2 | mipsisa32r2el \
    249251        | mipsisa64 | mipsisa64el \
     252        | mipsisa64r2 | mipsisa64r2el \
    250253        | mipsisa64sb1 | mipsisa64sb1el \
    251254        | mipsisa64sr71k | mipsisa64sr71kel \
    … …  
    258261        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
    259262        | pyramid \
    260         | s390 | s390x \
    261263        | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
    262264        | sh64 | sh64le \
    263         | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
     265        | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
    264266        | strongarm \
    265267        | tahoe | thumb | tic4x | tic80 | tron \
    … …  
    299301        | bs2000-* \
    300302        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
    301         | clipper-* | cydra-* \
     303        | clipper-* | craynv-* | cydra-* \
    302304        | d10v-* | d30v-* | dlx-* \
    303305        | elxsi-* \
    … …  
    306308        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
    307309        | i*86-* | i860-* | i960-* | ia64-* \
    308         | ip2k-* \
    309         | m32r-* \
     310        | ip2k-* | iq2000-* \
     311        | m32r-* | m32rle-* \
    310312        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
    311313        | m88110-* | m88k-* | mcore-* \
    … …  
    321323        | mipsisa32r2-* | mipsisa32r2el-* \
    322324        | mipsisa64-* | mipsisa64el-* \
     325        | mipsisa64r2-* | mipsisa64r2el-* \
    323326        | mipsisa64sb1-* | mipsisa64sb1el-* \
    324327        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
    325328        | mipstx39-* | mipstx39el-* \
     329        | mmix-* \
    326330        | msp430-* \
    327         | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
     331        | none-* | np1-* | ns16k-* | ns32k-* \
    328332        | orion-* \
    329333        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
    … …  
    331335        | pyramid-* \
    332336        | romp-* | rs6000-* \
    333         | s390-* | s390x-* \
    334337        | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
    335338        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
    336339        | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
    337         | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
     340        | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
    338341        | tahoe-* | thumb-* \
    339342        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
    … …  
    362365                os=-udi
    363366                ;;
     367        abacus)
     368                basic_machine=abacus-unknown
     369                ;;
    364370        adobe68k)
    365371                basic_machine=m68010-adobe
    … …  
    379385                basic_machine=x86_64-pc
    380386                ;;
     387        amd64-*)
     388                basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
     389                ;;
    381390        amdahl)
    382391                basic_machine=580-amdahl
    … …  
    438447                os=-unicos
    439448                ;;
     449        craynv)
     450                basic_machine=craynv-cray
     451                os=-unicosmp
     452                ;;
     453        cr16c)
     454                basic_machine=cr16c-unknown
     455                os=-elf
     456                ;;
    440457        crds | unos)
    441458                basic_machine=m68k-crds
    … …  
    443460        cris | cris-* | etrax*)
    444461                basic_machine=cris-axis
     462                ;;
     463        crx)
     464                basic_machine=crx-unknown
     465                os=-elf
    445466                ;;
    446467        da30 | da30-*)
    … …  
    643664        mips3*)
    644665                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
    645                 ;;
    646         mmix*)
    647                 basic_machine=mmix-knuth
    648                 os=-mmixware
    649666                ;;
    650667        monitor)
    … …  
    728745                basic_machine=np1-gould
    729746                ;;
    730         nv1)
    731                 basic_machine=nv1-cray
    732                 os=-unicosmp
    733                 ;;
    734747        nsr-tandem)
    735748                basic_machine=nsr-tandem
    … …  
    743756                os=-coff
    744757                ;;
     758        os400)
     759                basic_machine=powerpc-ibm
     760                os=-os400
     761                ;;
    745762        OSE68000 | ose68000)
    746763                basic_machine=m68000-ericsson
    … …  
    834851                basic_machine=romp-ibm
    835852                ;;
     853        s390 | s390-*)
     854                basic_machine=s390-ibm
     855                ;;
     856        s390x | s390x-*)
     857                basic_machine=s390x-ibm
     858                ;;
    836859        sa29200)
    837860                basic_machine=a29k-amd
    … …  
    956979        tower | tower-32)
    957980                basic_machine=m68k-ncr
     981                ;;
     982        tpf)
     983                basic_machine=s390x-ibm
     984                os=-tpf
    958985                ;;
    959986        udi29k)
    … …  
    10301057                basic_machine=romp-ibm
    10311058                ;;
     1059        mmix)
     1060                basic_machine=mmix-knuth
     1061                ;;
    10321062        rs6000)
    10331063                basic_machine=rs6000-ibm
    … …  
    10521082                basic_machine=sh64-unknown
    10531083                ;;
    1054         sparc | sparcv9 | sparcv9b)
     1084        sparc | sparcv8 | sparcv9 | sparcv9b)
    10551085                basic_machine=sparc-sun
    10561086                ;;
    … …  
    11251155              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
    11261156              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
    1127               | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
    1128               | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
     1157              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
     1158              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
     1159              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
    11291160              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
    11301161              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
    11311162              | -chorusos* | -chorusrdb* \
    11321163              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
    1133               | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
     1164              | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
    11341165              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
    11351166              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
    … …  
    11371168              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
    11381169              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
    1139               | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
     1170              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
    11401171        # Remember, each alternative MUST END IN *, to match a version number.
    11411172                ;;
    … …  
    11611192                os=`echo $os | sed -e 's|mac|macos|'`
    11621193                ;;
    1163         -linux*)
    1164                 os=`echo $os | sed -e 's|linux|linux-gnu|'`
     1194        -linux-dietlibc)
     1195                os=-linux-dietlibc
    11651196                ;;
    11661197        -sunos5*)
    … …  
    11731204                os=-openedition
    11741205                ;;
     1206        -os400*)
     1207                os=-os400
     1208                ;;
    11751209        -wince*)
    11761210                os=-wince
    … …  
    11931227        -atheos*)
    11941228                os=-atheos
     1229                ;;
     1230        -syllable*)
     1231                os=-syllable
    11951232                ;;
    11961233        -386bsd)
    … …  
    12151252        -sinix*)
    12161253                os=-sysv4
     1254                ;;
     1255        -tpf*)
     1256                os=-tpf
    12171257                ;;
    12181258        -triton*)
    … …  
    12831323                os=-aout
    12841324                ;;
    1285         c4x-* | tic4x-*)
    1286                 os=-coff
    1287                 ;;
     1325    c4x-* | tic4x-*)
     1326        os=-coff
     1327        ;;
    12881328        # This must come before the *-dec entry.
    12891329        pdp10-*)
    … …  
    13311371        *-ibm)
    13321372                os=-aix
     1373                ;;
     1374        *-knuth)
     1375                os=-mmixware
    13331376                ;;
    13341377        *-wec)
    … …  
    14641507                                vendor=ibm
    14651508                                ;;
     1509                        -os400*)
     1510                                vendor=ibm
     1511                                ;;
    14661512                        -ptx*)
    14671513                                vendor=sequent
     1514                                ;;
     1515                        -tpf*)
     1516                                vendor=ibm
    14681517                                ;;
    14691518                        -vxsim* | -vxworks* | -windiss*)

  • trunk/psModules/test/FullUnitTest

    r2140 r3623  
    1919#  RETURN : integer number of tests which failed
    2020#
    21 #  $Revision: 1.1 $  $Name: not supported by cvs2svn $
    22 #  $Date: 2004-10-14 23:58:56 $
     21#  $Revision: 1.2 $  $Name: not supported by cvs2svn $
     22#  $Date: 2005-04-01 20:11:19 $
    2323#
    2424#  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    2929use Cwd;
    3030
    31 # Provides functions for handling long command line options
     31# Provides functions for handling psS64 command line options
    3232use Getopt::Long;
    3333
    … …  
    6161# add PSLIB_ROOT/lib to LD_LIBRARY_PATH and DYLD_LIBRARY_PATH environment
    6262# variables
    63 $ENV{'LD_LIBRARY_PATH'}   = "$ENV{'PSLIB_ROOT'}/lib:$ENV{'LD_LIBRARY_PATH'}";
    64 $ENV{'DYLD_LIBRARY_PATH'} = "$ENV{'PSLIB_ROOT'}/lib:$ENV{'DYLD_LIBRARY_PATH'}";
     63$ENV{'LD_LIBRARY_PATH'}   = "$ENV{'PSLIB_ROOT'}/src/.libs:$ENV{'LD_LIBRARY_PATH'}";
     64$ENV{'DYLD_LIBRARY_PATH'} = "$ENV{'PSLIB_ROOT'}/src/.libs:$ENV{'DYLD_LIBRARY_PATH'}";
    6565
    6666# Initialize variables for counting the makes and test failures and the
    … …  
    239239            `make clean`;
    240240
    241             # Execute the make distclean
    242             `make distclean`;
    243241        }
    244242
    245243        # Execute the make and save results
    246         $_ = join( "\n|| ", split( "\n", "\n" . `make` ) );
     244        $_ = join( "\n|| ", split( "\n", "\n" . `make tests` ) );
    247245
    248246        # Check the output of make for return value != 0 or any of the
    249247        # following words: FAILED, FAULT, ERROR, Not found, SIGNAL
    250         if (   ( $? != 0 )
    251             || m/FAILED/i
    252             || m/FAULT/i
    253             || m/\bERROR/i
    254             || m/Not found/i
    255             || m/SIGNAL/i )
    256         {
     248        if ( $? != 0 ) {
    257249
    258250            # Display the errored output of make if silent option not enabled
    … …  
    276268            # Display the make was successful if silent option not set
    277269            print("\nMake successful.\n") if ( !$silent );
    278             if ($clean) {
    279                 `make install`;
    280             }
    281270        }
    282271    }
    … …  
    664653        s/$hostname\s*/<HOST>/g;
    665654        s/: Line \d+/: Line <LINENO>/g;
    666         s/\:\d+/\:<LINENO>/g;
     655        s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
     656        s/\s+[\_\-\/\.\w]+\:\d+/ FILE\:LINENO/g;
    667657        s/allocate \d+ bytes at/allocate <N> bytes at/g;
     658        s/v\d+.\d+.\d+/vX.X.X/g;
    668659
    669660        # Filter lines with *** malloc.  This is an artifact of Mac testing of
    … …  
    692683        s/$hostname\s*/<HOST>/g;
    693684        s/: Line \d+/: Line <LINENO>/g;
    694         s/\:\d+/\:<LINENO>/g;
     685        s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
     686        s/\s+[\_\-\/\.\w]+\:\d+/ FILE\:LINENO/g;
    695687        s/allocate \d+ bytes at/allocate <N> bytes at/g;
     688        s/v\d+.\d+.\d+/vX.X.X/g;
    696689
    697690        # Filter lines with *** malloc.  This is an artifact of Mac testing of

  • trunk/psModules/test/Makefile.am

    r3579 r3623  
    1 bin_PROGRAMS = tst_pmFlatField tst_pmMaskBadPixels tst_pmNonLinear tst_pmSubtractBias tst_pmReadoutCombine tst_pmSubtractSky tst_pmObjects01
     1# Makefile for psModule tests
    22
    33AM_LDFLAGS = -L../src -lpsmodule $(LDFLAGS)
    44
     5TESTS = tst_pmFlatField \
     6        tst_pmMaskBadPixels \
     7        tst_pmNonLinear \
     8        tst_pmSubtractBias \
     9        tst_pmReadoutCombine \
     10        tst_pmSubtractSky \
     11        tst_pmObjects01
     12
     13check_PROGRAMS = $(TESTS)
     14
     15TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified
     16
     17tests: $(TESTS)
     18
     19EXTRA_DIST = runTest
     20
     21CLEANFILES = $(TESTS)
     22
    523tst_pmFlatField_SOURCES = tst_pmFlatField.c
    6 
    724tst_pmMaskBadPixels_SOURCES = tst_pmMaskBadPixels.c
    8 
    925tst_pmNonLinear_SOURCES = tst_pmNonLinear.c
    10 
    1126tst_pmSubtractBias_SOURCES = tst_pmSubtractBias.c
    12 
    1327tst_pmReadoutCombine_SOURCES = tst_pmReadoutCombine.c
    14 
    1528tst_pmSubtractSky_SOURCES = tst_pmSubtractSky.c
    16 
    1729tst_pmObjects01_SOURCES = tst_pmObjects01.c
    18 

  • trunk/psModules/test/runTest

    r2140 r3623  
    1818#                 0    Test run successfull and all tests passed
    1919#                 1    Verified directory did not exist
    20 #                 2    Verified STDOUT file did not exist
    21 #                 4    Verified STDERR file did not exist
    2220#                 8    STDOUT files did not compare
    2321#                16    STDERR files did not compare
    2422#                32    Test driver doesn't exist or is not executable
    25 #                64    STDOUT captured contains error strings
    26 #               128    STDERR captured contains error strings
    27 #               256    Test driver did not return zero
     23#                64    Test driver did not return zero
    2824#
    2925#  SYNOSIS:  runTest testDriverName
    3026#
    3127#  $Revison:  $  $Name: not supported by cvs2svn $
    32 #  $Date: 2004-10-14 23:58:56 $
     28#  $Date: 2005-04-01 20:11:19 $
    3329#
    3430#  Copyright 2004 Maui High Performance Computering Center, University of Hawaii
    … …  
    3632################################################################################
    3733
    38 # Provides functions for handling long command line options
     34# Provides functions for handling psS64 command line options
    3935use Getopt::Long;
     36
     37$verifiedDir = "verified";
    4038
    4139# Assign variables based on the presence of command line options to the script
    … …  
    4442    "resetStderr!" => \$resetStderr,
    4543    "resetStdout!" => \$resetStdout,
     44    "verified=s"   => \$verifiedDir,
    4645    "help!"        => \$help
    4746);
    4847
    49 if ($help) {
     48if ($help || $#ARGV < 0) {
    5049    print
    5150"Usage: runTest [--reset] [--resetStderr] [--resetStdout] testfile(s)\n\n";
    … …  
    6261
    6362# Set up the PSLIB_ROOT environment variable if the user doesn't have it set
    64 if ( !$ENV{'PSLIB_ROOT'} ) {
    65 
    66     # Use the directory directly above test
    67     $PSLIB_ROOT = `cd ..;pwd`;
    68 
    69     # Remove newline for the end of path returned
    70     chomp($PSLIB_ROOT);
    71 
    72     # Set the environment variable
    73     $ENV{'PSLIB_ROOT'} = $PSLIB_ROOT;
    74 
    75     # Display message that PSLIB_ROOT not found and set to
    76     print("PSLIB_ROOT not found: set to $PSLIB_ROOT\n");
    77 }
    78 
    79 # Add PSLIB_ROOT/lib to LD_LIBRARY_PATH and DYLD_LIBRARY_PATH environment vars
    80 $ENV{'LD_LIBRARY_PATH'}   = "$ENV{'PSLIB_ROOT'}/lib:$ENV{'LD_LIBRARY_PATH'}";
    81 $ENV{'DYLD_LIBRARY_PATH'} = "$ENV{'PSLIB_ROOT'}/lib:$ENV{'DYLD_LIBRARY_PATH'}";
     63if ( $ENV{'PSLIB_ROOT'} ) {
     64
     65        # Add PSLIB_ROOT/lib to LD_LIBRARY_PATH and DYLD_LIBRARY_PATH environment vars
     66        $ENV{'LD_LIBRARY_PATH'}   = "$ENV{'PSLIB_ROOT'}/src/.libs:$ENV{'LD_LIBRARY_PATH'}";
     67        $ENV{'DYLD_LIBRARY_PATH'} = "$ENV{'PSLIB_ROOT'}/src/.libs:$ENV{'DYLD_LIBRARY_PATH'}";
     68}
    8269
    8370# Loop through the arguements passed to the script
    … …  
    9784
    9885    # Check if a verified directory exists in the current work directory
    99     if ( !( -e "verified" ) ) {
     86    if ( !( -e $verifiedDir ) ) {
    10087
    10188        # Display message that verified subdirectory doesn't exist
    … …  
    125112            # Display failure message with return value to user
    126113            if ( $? != 0 && ( $testFile !~ /^A/i ) ) {
    127                 print(
    128 "        Failed - Test Driver expected 0 return value (Return value $?)\n"
    129                 );
     114                print("Failed - Test Driver returned $?, expected 0.\n");
    130115            }
    131116            elsif ( $? == 0 && ( $testFile =~ /^A/i ) ) {
    132                 print(
    133 "        Failed - Test Driver expected abort (Return value $?)\n"
    134                 );
    135             }
    136             $exitValue |= 256;
    137         }
    138         else {
    139 
    140             # Test driver succeeded.
    141 
    142             # Create filtered version of stdout and stderr
    143 
    144             # Open the STDOUT file for reading
    145             open( OUTFILE, "< temp/$testFile.stdout" );
    146 
    147             # Open mod file to place filtered STDOUT
    148             open( MODFILE,  "> temp/$testFile.stdout.mod" );
    149             open( MODFILE2, "> verified/$testFile.stdout" ) if $resetStdout;
    150 
    151            # Replace the variable date, time and host information with constants
    152             $hostname = `hostname`;
    153             chop $hostname;
    154             while (<OUTFILE>) {
    155                 s/\s+\d+:\d+:\d+\w/<TIME>/g;
    156                 s/\d+:\d+:\d+/<DATE>/g;
    157                 s/$hostname\s*/<HOST>/g;
    158                 s/: Line \d+/: Line <LINENO>/g;
    159                 s/\:\d+/\:<LINENO>/g;
    160                 s/allocate \d+ bytes at/allocate <N> bytes at/g;
    161 
    162               # Filter lines with malloc.  This is an artifact of memory testing
    163               # with the Mac testbed
    164                 if ( !m/\*\*\*\smalloc/ ) {
    165                     print MODFILE ($_);
    166                     print MODFILE2 ($_) if $resetStdout;
    167                 }
    168             }
    169 
    170             # Close mod file
    171             close(MODFILE);
    172             close(MODFILE2) if $resetStdout;
    173 
    174             # Close STDERR file
    175             close(OUTFILE);
    176 
    177             # Open the STDERR file for reading
    178             open( OUTFILE, "< temp/$testFile.stderr" );
    179 
    180             # Open mod file to place filtered STDERR
    181             open( MODFILE,  "> temp/$testFile.stderr.mod" );
    182             open( MODFILE2, "> verified/$testFile.stderr" ) if $resetStderr;
    183 
    184            # Replace the variable date, time and host information with constants
    185             while (<OUTFILE>) {
    186                 s/\s+\d+:\d+:\d+\w/<TIME>/g;
    187                 s/\d+:\d+:\d+/<DATE>/g;
    188                 s/$hostname\s*/<HOST>/g;
    189                 s/: Line \d+/: Line <LINENO>/g;
    190                 s/\:\d+/\:<LINENO>/g;
    191                 s/allocate \d+ bytes at/allocate <N> bytes at/g;
    192 
    193               # Filter lines with malloc.  This is an artifact of memory testing
    194               # with the Mac testbed
    195                 if ( !m/\*\*\*\smalloc/ ) {
    196                     print MODFILE ($_);
    197                     print MODFILE2 ($_) if $resetStderr;
    198                 }
    199             }
    200 
    201             # Close mod file
    202             close(MODFILE);
    203             close(MODFILE2) if $resetStderr;
    204 
    205             # Close STDERR file
    206             close(OUTFILE);
    207 
    208             # Compare STDOUT capture with verified file
    209             $exitValue |= &compareStream("verified/$testFile.stdout");
    210 
    211             # Check exit value to determine if verified file doesn't exist
    212             if ( $exitValue & 2 ) {
    213 
    214                 # STDOUT verified doesn't exist.  Search STDOUT capture
    215                 # for strings indicating error or failure
    216                 $exitValue |= &errorStrSearch("$testFile.stdout");
    217             }
    218 
    219             # Compare STDERR capture with verified file
    220             $exitValue |= &compareStream("verified/$testFile.stderr");
    221 
    222             # Check exit value to determine if verified file doesn't exist
    223             if ( $exitValue & 4 ) {
    224 
    225                 # STDERR verified doesn't exist.  Search STDERR capture
    226                 # for strings indicating error or failure
    227                 $exitValue |= &errorStrSearch("$testFile.stderr");
    228             }
    229         }
    230     }
     117                print("Failed - Test Driver returned $?, expected abort.\n");
     118            }
     119            $exitValue |= 64;
     120        }
     121
     122        # Test driver succeeded.
     123
     124        # Create filtered version of stdout and stderr
     125
     126        # Open the STDOUT file for reading
     127        open( OUTFILE, "< temp/$testFile.stdout" );
     128
     129        # Open mod file to place filtered STDOUT
     130        open( MODFILE,  "> temp/$testFile.stdout.mod" );
     131        open( MODFILE2, "> $verifiedDir/$testFile.stdout" ) if $resetStdout;
     132
     133        # Replace the variable date, time and host information with constants
     134        $hostname = `hostname`;
     135        chop $hostname;
     136        while (<OUTFILE>) {
     137            s/\s+\d+:\d+:\d+\w/<TIME>/g;
     138            s/\d+:\d+:\d+/<DATE>/g;
     139            s/$hostname\s*/<HOST>/g;
     140            s/: Line \d+/: Line <LINENO>/g;
     141            s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
     142            s/\s+[\_\-\/\.\w]+\:\d+/ FILE\:LINENO/g;
     143            s/allocate \d+ bytes at/allocate <N> bytes at/g;
     144            s/v\d+.\d+.\d+/vX.X.X/g;
     145
     146            # Filter lines with malloc.  This is an artifact of memory testing
     147            # with the Mac testbed
     148            if ( !m/\*\*\*\smalloc/ ) {
     149                print MODFILE ($_);
     150                print MODFILE2 ($_) if $resetStdout;
     151            }
     152        }
     153
     154        # Close mod file
     155        close(MODFILE);
     156        close(MODFILE2) if $resetStdout;
     157
     158        # Close STDERR file
     159        close(OUTFILE);
     160
     161        # Open the STDERR file for reading
     162        open( OUTFILE, "< temp/$testFile.stderr" );
     163
     164        # Open mod file to place filtered STDERR
     165        open( MODFILE,  "> temp/$testFile.stderr.mod" );
     166        open( MODFILE2, "> $verifiedDir/$testFile.stderr" ) if $resetStderr;
     167
     168        # Replace the variable date, time and host information with constants
     169        while (<OUTFILE>) {
     170            s/\s+\d+:\d+:\d+\w/<TIME>/g;
     171            s/\d+:\d+:\d+/<DATE>/g;
     172            s/$hostname\s*/<HOST>/g;
     173            s/: Line \d+/: Line <LINENO>/g;
     174            s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
     175            s/\s+[\_\-\/\.\w]+\:\d+/ FILE\:LINENO/g;
     176            s/allocate \d+ bytes at/allocate <N> bytes at/g;
     177            s/v\d+.\d+.\d+/vX.X.X/g;
     178
     179            # Filter lines with malloc.  This is an artifact of memory testing
     180            # with the Mac testbed
     181            if ( !m/\*\*\*\smalloc/ ) {
     182                print MODFILE ($_);
     183                print MODFILE2 ($_) if $resetStderr;
     184            }
     185        }
     186
     187        # Close mod file
     188        close(MODFILE);
     189        close(MODFILE2) if $resetStderr;
     190
     191        # Close STDERR file
     192        close(OUTFILE);
     193
     194        # Compare STDOUT capture with verified file
     195        $exitValue |= &compareStream("$verifiedDir/$testFile.stdout");
     196
     197        # Check exit value to determine if verified file doesn't exist
     198        if ( $exitValue & 2 ) {
     199
     200            # STDOUT verified doesn't exist.  Search STDOUT capture
     201            # for strings indicating error or failure
     202            $exitValue |= &errorStrSearch("$testFile.stdout");
     203        }
     204
     205        # Compare STDERR capture with verified file
     206        $exitValue |= &compareStream("$verifiedDir/$testFile.stderr");
     207
     208        # Check exit value to determine if verified file doesn't exist
     209        if ( $exitValue & 4 ) {
     210
     211            # STDERR verified doesn't exist.  Search STDERR capture
     212            # for strings indicating error or failure
     213            $exitValue |= &errorStrSearch("$testFile.stderr");
     214        }
     215   }
    231216    else {
    232217
    … …  
    320305#
    321306#      Return:   0  -  Compare successful
    322 #                2  -  STDOUT verified file doesn't exist
    323 #                4  -  STDERR verified file doesn't exist
    324307#                8  -  STDOUT verified file doesn't compare
    325308#               16  -  STDERR verified file doesn't compare
    … …  
    333316
    334317    # Check for existence of verified STD stream files
    335     if ( !( -e $streamFile ) ) {
    336 
    337         # Display message to user that verified STDOUT file doesn't exist
    338         print("        File $streamFile doesn't exist.\n");
    339 
    340         # Set exit value bit 1 to indicate proper failure
    341         if ( $streamFile =~ /out$/ ) {
    342             $returnVal |= 2;
    343         }
    344         elsif ( $streamFile =~ /err$/ ) {
    345             $returnVal |= 4;
    346         }
    347     }
    348     else {
     318    if ( -e $streamFile ) {
    349319
    350320        # Verified STD stream file exists
    … …  
    352322        # Create name of the temp file to compare
    353323        $tempFile = $streamFile;
    354         $tempFile =~ s/verified/temp/;
     324        $tempFile =~ s/$verifiedDir/temp/;
    355325        $tempFile = $tempFile . ".mod";
    356326

  • trunk/psModules/test/verified/tst_pmFlatField.stderr

    r2289 r3623  
    55\**********************************************************************************/
    66
    7 <DATE><TIME>|<HOST>|E|pmFlatField (pmFlatField.c:<LINENO>)
     7<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
    88    Null not allowed for flat readout.
    9 <DATE><TIME>|<HOST>|E|pmFlatField (pmFlatField.c:<LINENO>)
     9<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
    1010    Null not allowed for input image.
    11 <DATE><TIME>|<HOST>|E|pmFlatField (pmFlatField.c:<LINENO>)
     11<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
    1212    Null not allowed for flat image.
    13 <DATE><TIME>|<HOST>|E|pmFlatField (pmFlatField.c:<LINENO>)
     13<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
    1414    Input image size exceeds that of flat image: (3, 3) vs (2, 2)
    15 <DATE><TIME>|<HOST>|E|pmFlatField (pmFlatField.c:<LINENO>)
     15<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
    1616    Input image mask size exceeds that of flat image: (4, 4) vs (3, 3)
    17 <DATE><TIME>|<HOST>|E|pmFlatField (pmFlatField.c:<LINENO>)
     17<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
    1818    Total offset >= flat image size: (50, 50) vs (3, 3)
    19 <DATE><TIME>|<HOST>|E|pmFlatField (pmFlatField.c:<LINENO>)
     19<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
    2020    Complex types not allowed for input image. Type: 2064
    21 <DATE><TIME>|<HOST>|E|pmFlatField (pmFlatField.c:<LINENO>)
     21<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
    2222    Complex types not allowed for flat image. Type: 2064
    23 <DATE><TIME>|<HOST>|E|pmFlatField (pmFlatField.c:<LINENO>)
     23<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
    2424    Input and flat image types differ: (1032 vs 1028)
    25 <DATE><TIME>|<HOST>|E|pmFlatField (pmFlatField.c:<LINENO>)
     25<DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)
    2626    Mask must be PS_TYPE_MASK type. Type: 1028
    2727

  • trunk/psModules/test/verified/tst_pmMaskBadPixels.stderr

    r2290 r3623  
    4141\**********************************************************************************/
    4242
    43 <DATE><TIME>|<HOST>|E|pmMaskBadPixels (pmMaskBadPixels.c:<LINENO>)
     43<DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)
    4444    Null not allowed for mask image.
    4545
    … …  
    5252\**********************************************************************************/
    5353
    54 <DATE><TIME>|<HOST>|E|pmMaskBadPixels (pmMaskBadPixels.c:<LINENO>)
     54<DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)
    5555    Null not allowed for input image.
    5656
    … …  
    6363\**********************************************************************************/
    6464
    65 <DATE><TIME>|<HOST>|E|pmMaskBadPixels (pmMaskBadPixels.c:<LINENO>)
     65<DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)
    6666    Input image size exceeds that of mask image: (60, 60) vs (50, 50)
    6767
    … …  
    7474\**********************************************************************************/
    7575
    76 <DATE><TIME>|<HOST>|E|pmMaskBadPixels (pmMaskBadPixels.c:<LINENO>)
     76<DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)
    7777    Input image mask size exceeds that of mask image: (60, 60) vs (50, 50)
    7878
    … …  
    8585\**********************************************************************************/
    8686
    87 <DATE><TIME>|<HOST>|E|pmMaskBadPixels (pmMaskBadPixels.c:<LINENO>)
     87<DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)
    8888    Total offset >= mask image: (150, 150) vs (50, 50)
    8989
    … …  
    9696\**********************************************************************************/
    9797
    98 <DATE><TIME>|<HOST>|E|pmMaskBadPixels (pmMaskBadPixels.c:<LINENO>)
     98<DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)
    9999    Complex types not allowed for input image. Type: 2064
    100100
    … …  
    107107\**********************************************************************************/
    108108
    109 <DATE><TIME>|<HOST>|E|pmMaskBadPixels (pmMaskBadPixels.c:<LINENO>)
     109<DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)
    110110    Mask must be PS_TYPE_MASK type. Type: 1032
    111111

  • trunk/psModules/test/verified/tst_pmNonLinear.stderr

    r2956 r3623  
    2323\**********************************************************************************/
    2424
    25 <DATE><TIME>|<HOST>|E|pmNonLinearityPolynomial (pmNonLinear.c:<LINENO>)
     25<DATE><TIME>|<HOST>|E|pmNonLinearityPolynomial (FILE:LINENO)
    2626    Unallowable operation: inputReadout is NULL.
    27 <DATE><TIME>|<HOST>|E|pmNonLinearityPolynomial (pmNonLinear.c:<LINENO>)
     27<DATE><TIME>|<HOST>|E|pmNonLinearityPolynomial (FILE:LINENO)
    2828    Unallowable operation: inputReadout->image is NULL.
    29 <DATE><TIME>|<HOST>|E|pmNonLinearityPolynomial (pmNonLinear.c:<LINENO>)
     29<DATE><TIME>|<HOST>|E|pmNonLinearityPolynomial (FILE:LINENO)
    3030    Unallowable operation: input1DPoly is NULL.
    3131
    … …  
    3838\**********************************************************************************/
    3939
    40 <DATE><TIME>|<HOST>|E|pmNonLinearityLookup (pmNonLinear.c:<LINENO>)
     40<DATE><TIME>|<HOST>|E|pmNonLinearityLookup (FILE:LINENO)
    4141    Unallowable operation: inputReadout is NULL.
    42 <DATE><TIME>|<HOST>|E|pmNonLinearityLookup (pmNonLinear.c:<LINENO>)
     42<DATE><TIME>|<HOST>|E|pmNonLinearityLookup (FILE:LINENO)
    4343    Unallowable operation: inputReadout->image is NULL.
    44 <DATE><TIME>|<HOST>|E|pmNonLinearityLookup (pmNonLinear.c:<LINENO>)
     44<DATE><TIME>|<HOST>|E|pmNonLinearityLookup (FILE:LINENO)
    4545    Unallowable operation: inFlux is NULL.
    46 <DATE><TIME>|<HOST>|E|pmNonLinearityLookup (pmNonLinear.c:<LINENO>)
     46<DATE><TIME>|<HOST>|E|pmNonLinearityLookup (FILE:LINENO)
    4747    Unallowable operation: outFlux is NULL.
    4848<DATE><TIME>|<HOST>|W|pmNonLinearityLookup
    … …  
    5858<DATE><TIME>|<HOST>|W|pmNonLinearityLookup
    5959    WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (25, 23)
    60 <DATE><TIME>|<HOST>|E|pmNonLinearityLookup (pmNonLinear.c:<LINENO>)
     60<DATE><TIME>|<HOST>|E|pmNonLinearityLookup (FILE:LINENO)
    6161    pmNonLinearityLookup(): input vector less than 2 elements.  Returning inputReadout image.
    6262<DATE><TIME>|<HOST>|W|vectorBinDisectF32

  • trunk/psModules/test/verified/tst_pmReadoutCombine.stderr

    r2942 r3623  
    1414\**********************************************************************************/
    1515
    16 <DATE><TIME>|<HOST>|E|pmReadoutCombine (pmReadoutCombine.c:<LINENO>)
     16<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
    1717    zero vector has incorrect size (5).  Returning NULL.
    18 <DATE><TIME>|<HOST>|E|pmReadoutCombine (pmReadoutCombine.c:<LINENO>)
     18<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
    1919    Unallowable operation: psVector zero has incorrect type.
    2020<DATE><TIME>|<HOST>|W|pmReadoutCombine
    2121    WARNING: the zero vector too many elements (11)
    22 <DATE><TIME>|<HOST>|E|pmReadoutCombine (pmReadoutCombine.c:<LINENO>)
     22<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
    2323    scale vector has incorrect size (5).  Returning NULL.
    24 <DATE><TIME>|<HOST>|E|pmReadoutCombine (pmReadoutCombine.c:<LINENO>)
     24<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
    2525    Unallowable operation: psVector scale has incorrect type.
    2626<DATE><TIME>|<HOST>|W|pmReadoutCombine
    2727    WARNING: the scale vector has too many elements (20)
    28 <DATE><TIME>|<HOST>|E|pmReadoutCombine (pmReadoutCombine.c:<LINENO>)
     28<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
    2929    Output image (1, 1) is too small to hold combined images.  Returning NULL.
    30 <DATE><TIME>|<HOST>|E|pmReadoutCombine (pmReadoutCombine.c:<LINENO>)
     30<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
    3131    Output image offset is larger then input image offset.  Returning NULL.
    32 <DATE><TIME>|<HOST>|E|pmReadoutCombine (pmReadoutCombine.c:<LINENO>)
     32<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
    3333    Unallowable operation: inputs is NULL.
    34 <DATE><TIME>|<HOST>|E|pmReadoutCombine (pmReadoutCombine.c:<LINENO>)
     34<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
    3535    Unallowable operation: params is NULL.
    36 <DATE><TIME>|<HOST>|E|pmReadoutCombine (pmReadoutCombine.c:<LINENO>)
     36<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
    3737    Multiple statistical options have been requested.  Returning NULL.
    38 <DATE><TIME>|<HOST>|E|pmReadoutCombine (pmReadoutCombine.c:<LINENO>)
     38<DATE><TIME>|<HOST>|E|pmReadoutCombine (FILE:LINENO)
    3939    Unallowable operation: params->stats is NULL.
    4040

  • trunk/psModules/test/verified/tst_pmSubtractBias.stderr

    r2942 r3623  
    5353\**********************************************************************************/
    5454
    55 <DATE><TIME>|<HOST>|E|pmSubtractBias (pmSubtractBias.c:<LINENO>)
     55<DATE><TIME>|<HOST>|E|pmSubtractBias (FILE:LINENO)
    5656    (overscans == NULL) && (overScanAxis != PM_OVERSCAN_NONE).  Returning in image
    57 <DATE><TIME>|<HOST>|E|pmSubtractBias (pmSubtractBias.c:<LINENO>)
     57<DATE><TIME>|<HOST>|E|pmSubtractBias (FILE:LINENO)
    5858    (overscans == NULL) && (overScanAxis != PM_OVERSCAN_NONE).  Returning in image
    59 <DATE><TIME>|<HOST>|E|pmSubtractBias (pmSubtractBias.c:<LINENO>)
     59<DATE><TIME>|<HOST>|E|pmSubtractBias (FILE:LINENO)
    6060    (overscans == NULL) && (overScanAxis != PM_OVERSCAN_NONE).  Returning in image
    6161<DATE><TIME>|<HOST>|W|pmSubtractBias
    … …  
    6969<DATE><TIME>|<HOST>|W|pmSubtractBias
    7070    WARNING: pmSubtractBias.(): overscan image has 7 columns, input image has 8 columns
    71 <DATE><TIME>|<HOST>|E|pmSubtractBias (pmSubtractBias.c:<LINENO>)
     71<DATE><TIME>|<HOST>|E|pmSubtractBias (FILE:LINENO)
    7272    Don't know how to scale the overscan vector.  Set fit to PM_FIT_SPLINE or PM_FIT_POLYNOMIAL.  Returning in image.
    7373<DATE><TIME>|<HOST>|W|pmSubtractBias
    7474    WARNING: pmSubtractBias.(): overscan image has 7 rows, input image has 8 rows
    75 <DATE><TIME>|<HOST>|E|pmSubtractBias (pmSubtractBias.c:<LINENO>)
     75<DATE><TIME>|<HOST>|E|pmSubtractBias (FILE:LINENO)
    7676    Don't know how to scale the overscan vector.  Set fit to PM_FIT_SPLINE or PM_FIT_POLYNOMIAL.  Returning in image.
    77 <DATE><TIME>|<HOST>|E|psSubtractFrame (pmSubtractBias.c:<LINENO>)
     77<DATE><TIME>|<HOST>|E|psSubtractFrame (FILE:LINENO)
    7878    bias image does not have enough rows.  Returning in image
    79 <DATE><TIME>|<HOST>|E|psSubtractFrame (pmSubtractBias.c:<LINENO>)
     79<DATE><TIME>|<HOST>|E|psSubtractFrame (FILE:LINENO)
    8080    bias image does not have enough columns.  Returning in image
    81 <DATE><TIME>|<HOST>|E|pmSubtractBias (pmSubtractBias.c:<LINENO>)
     81<DATE><TIME>|<HOST>|E|pmSubtractBias (FILE:LINENO)
    8282    fit is unallowable (54321).  Returning in image.
    83 <DATE><TIME>|<HOST>|E|pmSubtractBias (pmSubtractBias.c:<LINENO>)
     83<DATE><TIME>|<HOST>|E|pmSubtractBias (FILE:LINENO)
    8484    overScanAxis is unallowable (54321).  Returning in image.
    8585

  • trunk/psModules/test/verified/tst_pmSubtractSky.stderr

    r2942 r3623  
    3838\**********************************************************************************/
    3939
    40 <DATE><TIME>|<HOST>|E|pmSubtractSky (pmSubtractSky.c:<LINENO>)
     40<DATE><TIME>|<HOST>|E|pmSubtractSky (FILE:LINENO)
    4141    Unallowable operation: psReadout in or its data is NULL.
    42 <DATE><TIME>|<HOST>|E|pmSubtractSky (pmSubtractSky.c:<LINENO>)
     42<DATE><TIME>|<HOST>|E|pmSubtractSky (FILE:LINENO)
    4343    Unallowable operation: psReadout in or its data is NULL.
    44 <DATE><TIME>|<HOST>|E|pmSubtractSky (pmSubtractSky.c:<LINENO>)
     44<DATE><TIME>|<HOST>|E|pmSubtractSky (FILE:LINENO)
    4545    Unallowable operation: psImage in has incorrect type.
    4646<DATE><TIME>|<HOST>|W|pmSubtractSky
    … …  
    5656<DATE><TIME>|<HOST>|W|pmSubtractSky
    5757    WARNING: pmSubtractSky(): clipSD is -1.000000
    58 <DATE><TIME>|<HOST>|E|pmSubtractSky (pmSubtractSky.c:<LINENO>)
     58<DATE><TIME>|<HOST>|E|pmSubtractSky (FILE:LINENO)
    5959    psFit is unallowable (54321).  Returning in image.
    6060
Note: See TracChangeset for help on using the changeset viewer.