IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jan 27, 2013, 5:58:25 AM (13 years ago)
Author:
eugene
Message:

enable test mode from command-line (-test, after jython module); add parallel dvo option; make database selection more consistent and variable on test/not-test

Location:
branches/eam_branches/ipp-20121219/ippToPsps/test
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • branches/eam_branches/ipp-20121219/ippToPsps/test/fulltest.sh

    r35051 r35063  
    2525# mkgpc1.sh user localhost eam eam
    2626
    27 set mkgpc1      = 0
    28 set initdb      = 0
    29 set mkdummy     = 0
    30 set initscratch = 0
    31 set initbatch   = 0
    32 set camqueue    = 0
    33 set cambatch    = 0
    34 set stackqueue  = 0
    35 set stackbatch  = 0
     27set mkgpc1       = 1
     28set initdb       = 1
     29set mkdummy      = 1
     30set initscratch  = 1
     31set initbatch    = 1
     32set camqueue     = 1
     33set cambatch     = 1
     34set stackqueue   = 1
     35set stackbatch   = 1
    3636set objectqueue  = 1
    3737set objectbatch  = 1
     
    5656# create a dummy config so setupScratchDb.py does not fail
    5757if ($mkdummy) then
    58   ippjython queue.py edit <<EOF
     58  ippjython queue.py -test edit <<EOF
    5959dummy
    6060none
     
    80800
    81811
     820
    8283EOF
    8384endif
     
    8788
    8889  # create the database (ignore failure if it already exists)
    89   mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_test_scratch"
     90  mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_test_scratch1"
    9091  # mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch2"
    9192  # mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch3"
    9293
    93   mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch"
     94  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch1"
    9495  # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch2"
    9596  # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch3"
    9697
    97   ippjython setupScratchDb.py dummy ipptopsps_test_scratch
    98   # ippjython setupScratchDb.py dummy ipptopsps_scratch2
    99   # ippjython setupScratchDb.py dummy ipptopsps_scratch3
     98  ippjython setupScratchDb.py -test dummy ipptopsps_test_scratch1
     99  # ippjython setupScratchDb.py -test dummy ipptopsps_scratch2
     100  # ippjython setupScratchDb.py -test dummy ipptopsps_scratch3
    100101endif
    101102
    102103# this code is sensitive to a previously existing database?
    103104if ($camqueue) then
    104   ippjython queue.py edit <<EOF
     105  ippjython queue.py -test edit <<EOF
    105106$queuename
    106107test_ds
     
    1261270
    1271281
     1290
    128130y
    129131y
     
    133135if ($initbatch) then
    134136  rm -rf $OUTDIR/IN
    135   ippjython loader.py $queuename init
     137  ippjython loader.py -test $queuename init
    136138endif
    137139
    138140if ($cambatch) then
    139141  rm -rf $OUTDIR/P2
    140   ippjython loader.py $queuename once
     142  ippjython loader.py -test $queuename once
    141143endif
    142144
     
    146148    set stackqueuename = $queuename\_stk
    147149  endif
    148   ippjython queue.py edit <<EOF
     150  ippjython queue.py -test edit <<EOF
    149151$stackqueuename
    150152test_ds
     
    1701720
    1711731
     1740
    172175y
    173176y
     
    180183  endif
    181184  rm -rf $OUTDIR/ST
    182   ippjython loader.py $stackqueuename once
     185  ippjython loader.py -test $stackqueuename once
    183186endif
    184187
     
    188191    set objectqueuename = $queuename\_obj
    189192  endif
    190   ippjython queue.py edit <<EOF
     193  ippjython queue.py -test edit <<EOF
    191194$objectqueuename
    192195test_ds
     
    2122151
    2132161
     2170
    214218y
    215219y
     
    222226  endif
    223227  rm -rf $OUTDIR/OB
    224   ippjython loader.py $objectqueuename once
    225 endif
    226 
     228   ippjython loader.py -test $objectqueuename once
     229endif
     230
  • branches/eam_branches/ipp-20121219/ippToPsps/test/mkgpc1data.dvo

    r35051 r35063  
    44
    55if (not($?VERBOSE)) set VERBOSE = 0
     6if (not($?PARALLEL)) set PARALLEL = 0
    67
    78## this script must be run in this directory, output data goes to 'testdata'
     
    199200  end
    200201
     202  if ($PARALLEL)
     203    $hostname = `hostname`
     204    exec rm -f $catdir/HostTable.dat
     205    output $catdir/HostTable.dat
     206    echo "# ID Hostname Catdir"
     207    echo " 1 $hostname $catdir.p1"
     208    echo " 2 $hostname $catdir.p2"
     209    echo " 3 $hostname $catdir.p3"
     210    output stdout
     211    exec dvodist -out $catdir
     212  end
     213
    201214  # for i 0 $offset:n
    202215  #   tapOK {abs(Mcal[$i] - Mcal[0] - $offset:$i) < 0.001} "Mcal $i"
     
    239252
    240253    exec addstar -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass
     254  end
     255
     256  if ($PARALLEL)
     257    $hostname = `hostname`
     258    exec rm -f $catdir/HostTable.dat
     259    output $catdir/HostTable.dat
     260    echo "# ID Hostname Catdir"
     261    echo " 1 $hostname $catdir.p1"
     262    echo " 2 $hostname $catdir.p2"
     263    echo " 3 $hostname $catdir.p3"
     264    output stdout
     265    exec dvodist -out $catdir
    241266  end
    242267
     
    358383
    359384if ($SCRIPT)
     385  if ($argv:n > 0)
     386    if ("$argv:0" == "-parallel")
     387      $PARALLEL = 1
     388    end
     389  end
    360390  mkfull
    361391  exit 0
  • branches/eam_branches/ipp-20121219/ippToPsps/test/sastest.sh

    r35037 r35063  
    1919# mkgpc1.sh user localhost eam eam
    2020
    21 set mkgpc1      = 1
    22 set initdb      = 1
    23 set mkdummy     = 1
    24 set initscratch = 1
    25 set initbatch   = 0
    26 set camqueue    = 0
    27 set cambatch    = 0
     21set mkgpc1      = 0
     22set initdb      = 0
     23set mkdummy     = 0
     24set initscratch = 0
     25set initbatch   = 1
     26set camqueue    = 1
     27set cambatch    = 1
    2828set stackqueue  = 1
    2929set stackbatch  = 1
     
    4141  # does the database already exist?
    4242  # XXX this command will blow away an existing database!!
    43   mysql -h localhost -u dvo -pdvo -e "create database ipptopsps"
    44   mysql -h localhost -u dvo -pdvo ipptopsps < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql
     43  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test"
     44  mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql
    4545
    4646endif
     
    4848# create a dummy config so setupScratchDb.py does not fail
    4949if ($mkdummy) then
    50   ippjython queue.py edit <<EOF
     50  ippjython queue.py -test edit <<EOF
    5151dummy
    5252none
     
    72720
    73731
     740
     751
    7476EOF
    7577endif
     
    7981
    8082  # create the database (ignore failure if it already exists)
    81   mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch"
     83  mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch1"
    8284  # mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch2"
    8385  # mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch3"
    8486
    85   mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch"
     87  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch1"
    8688  # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch2"
    8789  # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch3"
    8890
    89   ippjython setupScratchDb.py dummy ipptopsps_scratch
    90   # ippjython setupScratchDb.py dummy ipptopsps_scratch2
    91   # ippjython setupScratchDb.py dummy ipptopsps_scratch3
     91  ippjython setupScratchDb.py -test dummy ipptopsps_scratch1
     92  # ippjython setupScratchDb.py -test dummy ipptopsps_scratch2
     93  # ippjython setupScratchDb.py -test dummy ipptopsps_scratch3
    9294endif
    9395
    9496# this code is sensitive to a previously existing database?
    9597if ($camqueue) then
    96   ippjython queue.py edit <<EOF
     98  ippjython queue.py -test edit <<EOF
    9799$queuename
    98100test_ds
     
    1181200
    1191211
     1220
     1231
    120124y
    121125y
     
    124128
    125129if ($initbatch) then
    126   ippjython loader.py $queuename init
     130  ippjython loader.py -test $queuename init
    127131endif
    128132
    129133if ($cambatch) then
    130   ippjython loader.py $queuename once
     134  ippjython loader.py -test $queuename once
    131135endif
    132136
     
    136140    set stackqueuename = $queuename\_stk
    137141  endif
    138   ippjython queue.py edit <<EOF
     142  ippjython queue.py -test edit <<EOF
    139143$stackqueuename
    140144test_ds
     
    1601640
    1611651
     1660
     1671
    162168y
    163169y
     
    169175    set stackqueuename = $queuename\_stk
    170176  endif
    171   ippjython loader.py $stackqueuename once
     177  ippjython loader.py -test $stackqueuename once
    172178endif
    173179
Note: See TracChangeset for help on using the changeset viewer.