Changeset 34041 for branches/meh_branches/ppstack_test/Ohana/src/addstar/test/tap.dvo

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• Ohana/src/addstar/test (modified) (1 prop)
• Ohana/src/addstar/test/tap.dvo (modified) (3 diffs)

branches/meh_branches/ppstack_test/Ohana/src/addstar/test

@@ -16 +16 @@
 relphot.Mag.png
 relphot.Mcal.dMcal.png
+catdir.wise.test

@@ -16 +16 @@
 relphot.Mag.png
 relphot.Mcal.dMcal.png
+catdir.wise.test

branches/meh_branches/ppstack_test/Ohana/src/addstar/test/tap.dvo

@@ -1 +1 @@
 # -*-sh-*-
+
+if (not($?TAP_BREAK)) set TAP_BREAK = 0
 
 macro tapOK
@@ -29 +31 @@
   $TAP_NTEST = $1
   $TAP_NFAIL = 0
+  $TAP_NSKIP = 0
   $TAP_NDONE = 0
   if (not($?TAP_BREAK)) set TAP_BREAK = 0
+end
+
+macro tapSKIP
+  if ($0 != 2) 
+    echo "USAGE: tapSKIP (nskip)"
+    break
+  end
+
+  $TAP_NSKIP ++
+  $TAP_NDONE ++
 end
 
@@ -47 +60 @@
   end
 
-  if ($TAP_NFAIL == 0) 
+  if ($TAP_NSKIP) 
+    echo "skipped $TAP_NSKIP of $TAP_NDONE"
+  end
+
+  if ($TAP_NFAIL + $TAP_NSKIP == 0) 
     echo "passed $TAP_NDONE tests"
   end

@@ -16 +16 @@
 relphot.Mag.png
 relphot.Mcal.dMcal.png
+catdir.wise.test