Changeset 35063 for branches/eam_branches/ipp-20121219/ippToPsps/test/sastest.sh

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

File:

• branches/eam_branches/ipp-20121219/ippToPsps/test/sastest.sh (modified) (10 diffs)

branches/eam_branches/ipp-20121219/ippToPsps/test/sastest.sh

@@ -19 +19 @@
 # mkgpc1.sh user localhost eam eam
 
-set mkgpc1      = 1
-set initdb      = 1
-set mkdummy     = 1
-set initscratch = 1
-set initbatch   = 0
-set camqueue    = 0
-set cambatch    = 0
+set mkgpc1      = 0
+set initdb      = 0
+set mkdummy     = 0
+set initscratch = 0
+set initbatch   = 1
+set camqueue    = 1
+set cambatch    = 1
 set stackqueue  = 1
 set stackbatch  = 1
@@ -41 +41 @@
   # does the database already exist?
   # XXX this command will blow away an existing database!!
-  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps"
-  mysql -h localhost -u dvo -pdvo ipptopsps < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql
+  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test"
+  mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql
 
 endif
@@ -48 +48 @@
 # create a dummy config so setupScratchDb.py does not fail
 if ($mkdummy) then
-  ippjython queue.py edit <<EOF
+  ippjython queue.py -test edit <<EOF
 dummy
 none
@@ -72 +72 @@
 0
 1
+0
+1
 EOF
 endif
@@ -79 +81 @@
 
   # create the database (ignore failure if it already exists)
-  mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch"
+  mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch1"
   # mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch2"
   # mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch3"
 
-  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch"
+  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch1"
   # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch2"
   # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch3"
 
-  ippjython setupScratchDb.py dummy ipptopsps_scratch
-  # ippjython setupScratchDb.py dummy ipptopsps_scratch2
-  # ippjython setupScratchDb.py dummy ipptopsps_scratch3
+  ippjython setupScratchDb.py -test dummy ipptopsps_scratch1
+  # ippjython setupScratchDb.py -test dummy ipptopsps_scratch2
+  # ippjython setupScratchDb.py -test dummy ipptopsps_scratch3
 endif
 
 # this code is sensitive to a previously existing database?
 if ($camqueue) then
-  ippjython queue.py edit <<EOF
+  ippjython queue.py -test edit <<EOF
 $queuename
 test_ds
@@ -118 +120 @@
 0
 1
+0
+1
 y
 y
@@ -124 +128 @@
 
 if ($initbatch) then
-  ippjython loader.py $queuename init
+  ippjython loader.py -test $queuename init
 endif
 
 if ($cambatch) then
-  ippjython loader.py $queuename once
+  ippjython loader.py -test $queuename once
 endif
 
@@ -136 +140 @@
     set stackqueuename = $queuename\_stk
   endif
-  ippjython queue.py edit <<EOF
+  ippjython queue.py -test edit <<EOF
 $stackqueuename
 test_ds
@@ -160 +164 @@
 0
 1
+0
+1
 y
 y
@@ -169 +175 @@
     set stackqueuename = $queuename\_stk
   endif
-  ippjython loader.py $stackqueuename once
+  ippjython loader.py -test $stackqueuename once
 endif