Changeset 39044 for trunk

Timestamp:

Nov 5, 2015, 1:08:21 PM (11 years ago)

Author:

eugene

Message:

split out mkgpc1 and mkdvo options

File:

• trunk/ippToPsps/test/sastest.sh (modified) (9 diffs)

trunk/ippToPsps/test/sastest.sh

@@ -18 +18 @@
 # default is OFF
 set mkgpc1       = 0
+set mkdvo        = 0
 set initdb       = 1
 set initscratch  = 1
@@ -48 +49 @@
     echo " -XX : turn off features"
     echo " +XX : turn on features"
-    echo "  features: all, mkgpc1, initdb, initscratch, initbatch, camera, stack, forcedwarp, object, forcedobject, diff, diffobj"
+    echo "  features: all, mkgpc1, mkdvo, initdb, initscratch, initbatch, camera, stack, forcedwarp, object, forcedobject, diff, diffobj"
     exit 2
   case -all
     set mkgpc1       = 0
+    set mkdvo        = 0
     set initdb       = 0
     set initscratch  = 0
@@ -73 +75 @@
     set mkgpc1 = 0
     breaksw;
+  case -mkdvo
+    set mkdvo = 0
+    breaksw;
   case -initdb
     set initdb = 0
@@ -129 +134 @@
  switch ("$targ[1]")
   case +all
-    # need to turn on mkgpc1 explicitly
+    # need to turn on mkgpc1 or mkdvo explicitly
+    set mkdvo        = 0
     set mkgpc1       = 0
     set initdb       = 1
@@ -149 +155 @@
     set diffobjbatch = 1
     breaksw;
+  case +mkdvo
+    set mkdvo = 1
+    breaksw;
   case +mkgpc1
     set mkgpc1 = 1
@@ -203 +212 @@
     echo "  (NOTE: you need to explicitly turn on mkgpc1 if you want to re-build the dvo)"
     exit 2
+endif
+
+if ($mkdvo && $mkgpc1) then
+  echo "+mkgpc1 and +mkdvo cannot both be supplied"
+  exit 2
 endif
 
@@ -216 +230 @@
 if ($mkgpc1) then
   echo ""
+  echo " ---- mksasdata.dvo : creating the gpc1 database entries ----"
+  mksasdata.dvo mkdb
+  if ($status) then
+    echo "failed to generate the gpc1 entries"
+    exit 2
+  endif
+endif
+
+if ($mkdvo) then
+  echo ""
   echo " ---- mksasdata.dvo : creating the dvo & gpc1 database entries ----"
-  mksasdata.dvo
+  mksasdata.dvo mkfull
   if ($status) then
     echo "failed to generate the data & dvo, quitting"
@@ -291 +315 @@
 
   echo ""
-  echo " ---- create init batch ----"
+  echo " ---- create IN batch ----"
 
   rm -rf $OUTDIR/IN
@@ -607 +631 @@
   echo " ---- load DF batches ----"
 
-  rm -rf $OUTDIR/FW
+  rm -rf $OUTDIR/DF
   ippjython loader.py $options $diffqueuename once -simtest < /dev/null
   if ($status) exit