Changeset 42058 for branches/eam_branches/ipp-20211108/ippTests/ippCheck/tap.pro

Timestamp:

Feb 24, 2022, 2:36:09 PM (4 years ago)

Author:

eugene

Message:

add tap.skip, fix counting of tap tests based on context (warp, diff, camera), add option for ippCheck class to modify success criteria

File:

• branches/eam_branches/ipp-20211108/ippTests/ippCheck/tap.pro (modified) (3 diffs)

branches/eam_branches/ipp-20211108/ippTests/ippCheck/tap.pro

@@ -3 +3 @@
 if (not($?TAP_VERBOSE)) set TAP_VERBOSE = 1
 
-macro plan
+macro tap.plan
  if ($0 != 2)
   echo "USAGE: plan (Ntest)"
@@ -12 +12 @@
  $tap_Npass = 0
  $tap_Nfail = 0
+ $tap_Nskip = 0
  $tap_Ntest = 0
 end
 
-macro done
- if (not($?tap_Nplan))
-  echo "ERROR: tap tests not planned"
+macro tap.skip
+ if ($0 != 2)
+  echo "USAGE skip (Nskip)"
   break
  end
 
- echo "planned $tap_Nplan tests, ran $tap_Ntest"
- echo "passed $tap_Npass tests, failed $tap_Nfail tests"
-
- if (($tap_Nfail == 0) && ($tap_Ntest == $tap_Nplan) && ($tap_Npass == $tap_Ntest))
-   echo "PASS: all tests run and passed"
-   return 1
- end
-
- if ($tap_Nfail > 0)
-   echo "FAIL: $tap_Nfail tests failed"
- end
-
- if ($tap_Ntest != $tap_Nplan)
-   echo "FAIL: not all tests run"
- end
-
- if ($tap_Ntest != $tap_Npass + $tap_Nfail)
-   echo "FAIL: inconsistent count: $tap_Ntest tests != $tap_Npass pass + $tap_Nfail fail"
- end
+  $tap_Nskip += $1
 end
 
-macro ok
+macro tap.ok
  if ($0 != 3)
-  echo "USAGE (condition) (label)"
+  echo "USAGE: ok (condition) (label)"
   break
  end
@@ -63 +46 @@
 end
 
+macro tap.done
+ if (not($?tap_Nplan))
+  echo "ERROR: tap tests not planned"
+  break
+ end
+
+ echo "planned $tap_Nplan tests, ran $tap_Ntest, skipped $tap_Nskip"
+ echo "passed $tap_Npass tests, failed $tap_Nfail tests"
+
+ if (($tap_Nfail == 0) && ($tap_Ntest + $tap_Nskip == $tap_Nplan) && ($tap_Npass == $tap_Ntest))
+   echo "PASS: all tests run and passed"
+   return 1
+ end
+
+ if ($tap_Nfail > 0)
+   echo "FAIL: $tap_Nfail tests failed"
+ end
+
+ if ($tap_Ntest + $tap_Nskip != $tap_Nplan)
+   echo "FAIL: not all tests run"
+ end
+
+ if ($tap_Ntest != $tap_Npass + $tap_Nfail)
+   echo "FAIL: inconsistent count: $tap_Ntest tests != $tap_Npass pass + $tap_Nfail fail"
+ end
+end
+