Changeset 38823 for trunk/ippToPsps/test

Timestamp:

Oct 8, 2015, 2:07:30 PM (11 years ago)

Author:

eugene

Message:

removing duplicate jython.jar; only copy in jython2.5.3b1 is kept

Location:

trunk/ippToPsps/test

Files:

• fulltest.sh (modified) (2 diffs)
• mkgpc1data.dvo (modified) (1 diff)

trunk/ippToPsps/test/fulltest.sh

@@ -156 +156 @@
   # does the database already exist?
   # XXX this command will blow away an existing database!!
-  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test"
-  mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql
+  mysql -h localhost -u dvo -pdvo -e "create database if not exists ipptopsps_test" || exit 3
+  mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql || exit 2
 endif
 
@@ -166 +166 @@
 
   # create the database (ignore failure if it already exists)
-  mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_test_scratch"
+  mysql -h localhost -u dvo -pdvo -e "drop database if exists ipptopsps_test_scratch"
   mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch"
   ippjython setupScratchDb.py -test < /dev/null

trunk/ippToPsps/test/mkgpc1data.dvo

@@ -147 +147 @@
 
     mkinput $offset $rawfile
+    echo mkcmf -photcode SIMTEST.r.Chip -no-noise -append $rawfile $cmffile -date $myDATE -time $myTIME -radec $RA $DEC -type $1 -imageID $ID -sourceID 0
     exec mkcmf -photcode SIMTEST.r.Chip -no-noise -append $rawfile $cmffile -date $myDATE -time $myTIME -radec $RA $DEC -type $1 -imageID $ID -sourceID 0