Index: branches/eam_branches/ipp-20121219/ippToPsps/test/fulltest.sh
===================================================================
--- branches/eam_branches/ipp-20121219/ippToPsps/test/fulltest.sh	(revision 35063)
+++ branches/eam_branches/ipp-20121219/ippToPsps/test/fulltest.sh	(revision 35076)
@@ -25,11 +25,11 @@
 # mkgpc1.sh user localhost eam eam
 
-set mkgpc1       = 1
-set initdb       = 1
-set mkdummy      = 1
-set initscratch  = 1
-set initbatch    = 1
-set camqueue     = 1
-set cambatch     = 1
+set mkgpc1       = 0
+set initdb       = 0
+set mkdummy      = 0
+set initscratch  = 0
+set camqueue     = 0
+set initbatch    = 0
+set cambatch     = 0
 set stackqueue   = 1
 set stackbatch   = 1
@@ -54,33 +54,34 @@
 endif
 
-# 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
+## 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
@@ -96,7 +97,9 @@
   # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch3"
 
-  ippjython setupScratchDb.py -test dummy ipptopsps_test_scratch1
-  # ippjython setupScratchDb.py -test dummy ipptopsps_scratch2
-  # ippjython setupScratchDb.py -test dummy 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
 endif