X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fuuid.at;h=da64dd4d68899567246547411c9f63dce30fcc33;hb=HEAD;hp=24f7180fb3d87720de3a8ed8c52a1fb32a179065;hpb=a4af00400a835eb87569ba40e21874c05e872c0f;p=sliver-openvswitch.git

diff --git a/tests/uuid.at b/tests/uuid.at
index 24f7180fb..da64dd4d6 100644
--- a/tests/uuid.at
+++ b/tests/uuid.at
@@ -12,33 +12,13 @@ m4_define([CHECK_UUID],
      exit 1
    fi])
 
-# This test is a strict subset of the larger test down below, but it
-# completes in a realistic amount of time with the "lcov" wrapper.
-AT_SETUP([UUID generation])
-AT_KEYWORDS([UUID])
-AT_CHECK([test-uuid > uuid])
-AT_CHECK([
-  uuid=`cat uuid`
-  CHECK_UUID])
-AT_CLEANUP
-
-# This test is a strict subset of the larger test down below, but it
-# completes in a realistic amount of time with the "lcov" wrapper.
-AT_SETUP([UUID parsing and serialization])
-AT_KEYWORDS([UUID])
-AT_CHECK([test-uuid f47ac10b-58cc-4372-a567-0e02b2c3d479], [0],
-         [f47ac10b-58cc-4372-a567-0e02b2c3d479
-])
-AT_CLEANUP
-
 AT_SETUP([UUID generation, parsing, serialization])
-AT_SKIP_IF([test "$CHECK_LCOV" = true]) # lcov makes this test absurdly slow
 AT_KEYWORDS([UUID])
 AT_CHECK([
   uuids=
   for i in m4_for([count], [1], [100], [1], [count ]); do
      # Generate random UUID and check that it is in the expected format.
-     uuid=`test-uuid`
+     uuid=`ovstest test-uuid`
      CHECK_UUID
 
      # Verify that $uuid does not duplicate any UUID generated so far.
@@ -50,7 +30,7 @@ AT_CHECK([
      uuids="$uuids $uuid"
 
      # Verify that test-uuid parses and re-serializes this UUID correctly.
-     serialized=`test-uuid $uuid`
+     serialized=`ovstest test-uuid $uuid`
      if test "$uuid" != "$serialized"; then
        echo "$uuid: test-uuid serialized this as $serialized"
        exit 1