Changeset 35235 for branches/eam_branches/ipp-20130207/ippToPsps/test/fulltest.sh

Timestamp:

Mar 5, 2013, 2:23:09 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130207/ippToPsps

Files:

• . (modified) (1 prop)
• test/fulltest.sh (modified) (3 diffs)

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

@@ -25 +25 @@
 # mkgpc1.sh user localhost eam eam
 
-set mkgpc1       = 0
+set mkgpc1       = 1
 set initdb       = 1
-set mkdummy      = 1
 set initscratch  = 1
 set camqueue     = 1
@@ -34 +33 @@
 set stackqueue   = 1
 set stackbatch   = 1
-set objectqueue  = 0
-set objectbatch  = 0
+set objectqueue  = 1
+set objectbatch  = 1
 
 set OUTDIR = "testdata"
@@ -54 +53 @@
 endif
 
-## XXX no longer needed : setupScratchDb does not need a fake 'config' (or 'chunk')
-## # create a dummy config so setupScratchDb.py does not fail
-## if ($mkdummy) then
-##   ippjython queue.py -test edit <<EOF
-## dummy
-## none
-## IPP_PSPS
-## 0
-## none
-## none
-## 0
-## 0
-## 0
-## 0
-## 1
-## none
-## 0
-## 0
-## 1
-## 1
-## 2001-01-01 00:00:00.0
-## NONE
-## NONE
-## 1
-## 0
-## 0
-## 1
-## 0
-## EOF
-## endif
-
 # re-create the ipptopsps database
 if ($initscratch) then 
 
   # create the database (ignore failure if it already exists)
-  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_scratch1"
-  # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch2"
-  # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch3"
-
-  # setupScratchDb.py now takes the scratch name version, which is appended to the
-  # name in the settings.xml table
-  ippjython setupScratchDb.py -test 1
-  # ippjython setupScratchDb.py -test 2
-  # ippjython setupScratchDb.py -test 3
+  mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_test_scratch"
+  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch"
+  ippjython setupScratchDb.py -test
 endif