Changeset 38903

Timestamp:

Oct 20, 2015, 3:24:11 PM (11 years ago)

Author:

eugene

Message:

avoid name collisions for queuenames

File:

• trunk/ippToPsps/test/fulltest.sh (modified) (8 diffs)

trunk/ippToPsps/test/fulltest.sh

@@ -23 +23 @@
 set stackqueue   = 1
 set stackbatch   = 1
-set forcequeue   = 0
-set forcebatch   = 0
+set forcequeue   = 1
+set forcebatch   = 1
 set objectqueue  = 1
 set objectbatch  = 1
@@ -151 +151 @@
 endif
 
-set stackqueuename = 0
-set objectqueuename = 0
-
 set OUTDIR = "testdata"
 set queuename = "test"
+set stackqueuename = $queuename\_stk
+set objectqueuename = $queuename\_obj
+set forcedwarpqueuename = $queuename\_wrp
+
 
 if ($mkgpc1) then
@@ -296 +297 @@
   echo " ---- queue ST batches ----"
 
-  if ($stackqueuename == 0) then
-    set stackqueuename = $queuename\_stk
-  endif
   echo "$stackqueuename       " >  stackbatch.dat # skychunk name
   echo "test_ds               " >> stackbatch.dat # datastore_product
@@ -339 +337 @@
   echo " ---- load ST batches ----"
 
-  if ($stackqueuename == 0) then
-    set stackqueuename = $queuename\_stk
-  endif
   rm -rf $OUTDIR/ST
   ippjython loader.py -test $stackqueuename once -simtest < /dev/null
@@ -352 +347 @@
   echo " ---- queue FW batches ----"
 
-  echo "$queuename            " >  forcebatch.dat # skychunk name
+  echo "$forcedwarpqueuename  " >  forcebatch.dat # skychunk name
   echo "test_ds               " >> forcebatch.dat # datastore_product
   echo "IPP_PSPS              " >> forcebatch.dat # datastore_type
@@ -393 +388 @@
 
   rm -rf $OUTDIR/FW
-  ippjython loader.py -test $queuename once -simtest < /dev/null
+  ippjython loader.py -test $forcedwarpqueuename once -simtest < /dev/null
   if ($status) exit
 endif
@@ -402 +397 @@
   echo " ---- queue OB batches ----"
 
-  if ($objectqueuename == 0) then
-    set objectqueuename = $queuename\_obj
-  endif
   echo "$objectqueuename      " >  objectbatch.dat # skychunk name
   echo "test_ds               " >> objectbatch.dat # datastore_product
@@ -445 +437 @@
   echo " ---- load OB batches ----"
 
-  if ($objectqueuename == 0) then
-    set objectqueuename = $queuename\_obj
-  endif
   rm -rf $OUTDIR/OB