Index: branches/eam_branches/ipp-20121219/ippToPsps/test/fulltest.sh
===================================================================
--- branches/eam_branches/ipp-20121219/ippToPsps/test/fulltest.sh	(revision 35004)
+++ branches/eam_branches/ipp-20121219/ippToPsps/test/fulltest.sh	(revision 35013)
@@ -1,3 +1,9 @@
 #!/bin/csh -f
+
+set stackqueuename = 0
+if ($#argv > 0) then
+  set stackqueuename = $1
+  echo "stackqueue: $stackqueuename"
+endif
 
 # a bit crude : get the datadir path by interpollation of the PATH element for psconfig
@@ -13,11 +19,13 @@
 # mkgpc1.sh user localhost eam eam
 
-set mkgpc1 = 1
-set initdb = 1
-set mkdummy = 1
-set initscratch = 1
-set createqueue = 1
-set initbatch = 1
-set onebatch = 1
+set mkgpc1      = 0
+set initdb      = 0
+set mkdummy     = 0
+set initscratch = 0
+set initbatch   = 0
+set camqueue    = 0
+set cambatch    = 0
+set stackqueue  = 1
+set stackbatch  = 0
 
 set OUTDIR = "testdata"
@@ -85,5 +93,5 @@
 
 # this code is sensitive to a previously existing database?
-if ($createqueue) then
+if ($camqueue) then
   ippjython queue.py edit <<EOF
 $queuename
@@ -119,12 +127,15 @@
 endif
 
-if ($onebatch) then
+if ($cambatch) then
   ippjython loader.py $queuename once
 endif
 
 # this code is sensitive to a previously existing database?
-if ($createqueue) then
+if ($stackqueue) then
+  if ($stackqueuename == 0) then
+    set stackqueuename = $queuename\_stk
+  endif
   ippjython queue.py edit <<EOF
-$queuename\_stk
+$stackqueuename
 test_ds
 IPP_PSPS
@@ -154,2 +165,9 @@
 endif
 
+if ($stackbatch) then
+  if ($stackqueuename == 0) then
+    set stackqueuename = $queuename\_stk
+  endif
+  ippjython loader.py $stackqueuename once
+endif
+