Changeset 35063 for branches/eam_branches/ipp-20121219/ippToPsps/test/fulltest.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/fulltest.sh (modified) (12 diffs)

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

@@ -25 +25 @@
 # mkgpc1.sh user localhost eam eam
 
-set mkgpc1      = 0
-set initdb      = 0
-set mkdummy     = 0
-set initscratch = 0
-set initbatch   = 0
-set camqueue    = 0
-set cambatch    = 0
-set stackqueue  = 0
-set stackbatch  = 0
+set mkgpc1       = 1
+set initdb       = 1
+set mkdummy      = 1
+set initscratch  = 1
+set initbatch    = 1
+set camqueue     = 1
+set cambatch     = 1
+set stackqueue   = 1
+set stackbatch   = 1
 set objectqueue  = 1
 set objectbatch  = 1
@@ -56 +56 @@
 # 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
@@ -80 +80 @@
 0
 1
+0
 EOF
 endif
@@ -87 +88 @@
 
   # 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 ipptopsps_test_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_test_scratch"
+  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_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_test_scratch
-  # ippjython setupScratchDb.py dummy ipptopsps_scratch2
-  # ippjython setupScratchDb.py dummy ipptopsps_scratch3
+  ippjython setupScratchDb.py -test dummy ipptopsps_test_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
@@ -126 +127 @@
 0
 1
+0
 y
 y
@@ -133 +135 @@
 if ($initbatch) then
   rm -rf $OUTDIR/IN
-  ippjython loader.py $queuename init
+  ippjython loader.py -test $queuename init
 endif
 
 if ($cambatch) then
   rm -rf $OUTDIR/P2
-  ippjython loader.py $queuename once
+  ippjython loader.py -test $queuename once
 endif
 
@@ -146 +148 @@
     set stackqueuename = $queuename\_stk
   endif
-  ippjython queue.py edit <<EOF
+  ippjython queue.py -test edit <<EOF
 $stackqueuename
 test_ds
@@ -170 +172 @@
 0
 1
+0
 y
 y
@@ -180 +183 @@
   endif
   rm -rf $OUTDIR/ST
-  ippjython loader.py $stackqueuename once
+  ippjython loader.py -test $stackqueuename once
 endif
 
@@ -188 +191 @@
     set objectqueuename = $queuename\_obj
   endif
-  ippjython queue.py edit <<EOF
+  ippjython queue.py -test edit <<EOF
 $objectqueuename
 test_ds
@@ -212 +215 @@
 1
 1
+0
 y
 y
@@ -222 +226 @@
   endif
   rm -rf $OUTDIR/OB
-  ippjython loader.py $objectqueuename once
-endif
-
+   ippjython loader.py -test $objectqueuename once
+endif
+