Changeset 38441 for trunk/Ohana/src/addstar/test/tap.dvo

Timestamp:

Jun 12, 2015, 6:18:23 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM dev branch ohana.20150429

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/addstar/test (modified) (2 props)
• src/addstar/test/tap.dvo (modified) (2 diffs)

trunk/Ohana/src/addstar/test

@@ -17 +17 @@
 relphot.Mcal.dMcal.png
 catdir.wise.test
+dvo.photcodes
+ptolemy.rc
+tap.log

@@ -17 +17 @@
 relphot.Mcal.dMcal.png
 catdir.wise.test
+dvo.photcodes
+ptolemy.rc
+tap.log

trunk/Ohana/src/addstar/test/tap.dvo

@@ -3 +3 @@
 if (not($?TAP_BREAK)) set TAP_BREAK = 0
 if (not($?TAP_VERBOSE)) set TAP_VERBOSE = 0
+
+macro tapEXEC
+  if ($0 < 3) 
+    echo "USAGE: tapEXEC (command)"
+    break
+  end
+
+  local i cmd result
+
+  $cmd = ""
+  for i 1 $0
+    $cmd = $cmd $$i
+  end
+
+  if ($TAP_VERBOSE >= 2) echo $cmd
+
+  break -auto off
+  exec $cmd >& tap.log
+  $result = $STATUS
+  break -auto on
+
+  if (not($result)) 
+    exec cat tap.log
+    echo "not ok : $cmd"
+    $TAP_NFAIL ++
+    $TAP_LAST = 0
+    if ($TAP_BREAK)
+     break
+    end
+  else
+    if ($TAP_VERBOSE >= 1) echo "ok : $cmd"
+    $TAP_LAST = 1
+  end
+  $TAP_NDONE ++
+end
 
 macro tapOK
@@ -11 +46 @@
 
   if ($1)
-    if ($TAP_VERBOSE)
+    if ($TAP_VERBOSE >= 1)
       echo "ok : $2"
     end

@@ -17 +17 @@
 relphot.Mcal.dMcal.png
 catdir.wise.test
+dvo.photcodes
+ptolemy.rc
+tap.log