tests: make UUIDs under data/ctf-traces/intersection unique

Traces under data/ctf-traces/intersection currently share some UUID
values, even though they are different traces.  I presume it was not
really the initial intention (although it doesn't really matter when
handling them separately).  However, this prevents using them
simultaneously for testing, as they will get treated as part of the same
trace, when that's not what we want.

This patch assigns new, random UUIDs to all duplicated trace and clock
UUIDs.

Change-Id: I7b426640a787a70635162a3c8f1a6c7854072305
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2025
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/tests/data/ctf-traces/intersection/3eventsintersectreverse/metadata b/tests/data/ctf-traces/intersection/3eventsintersectreverse/metadata
index 7cc1b4d1f996840b188b5f6e086dc7df98e96fa2..7379027b94571f33c381ebc8cc31999b97b02bfc 100644 (file)
--- a/tests/data/ctf-traces/intersection/3eventsintersectreverse/metadata
+++ b/tests/data/ctf-traces/intersection/3eventsintersectreverse/metadata
@@ -3,7 +3,7 @@
 trace {
        major = 1;
        minor = 8;
-       uuid = "7afe8fbe-79b8-4f6a-bbc7-d0c782e7ddaf";
+       uuid = "6faef770-c4b0-4bf6-afcb-b33546dfb87e";
        byte_order = be;
        packet.header := struct {
                integer { size = 32; align = 8; signed = false; encoding = none; base = decimal; byte_order = be; } magic;
@@ -18,7 +18,7 @@ env {
 
 clock {
        name = test_clock;
-       uuid = "7b9e2f2a-530e-4ab1-816f-0831b5c09140";
+       uuid = "a0c643c4-b36c-4358-94a9-8bc54efade5e";
        description = "This is a test clock";
        freq = 1000000000;
        precision = 10;

diff --git a/tests/data/ctf-traces/intersection/nostream/metadata b/tests/data/ctf-traces/intersection/nostream/metadata
index 5e14a71be411853c6b54c832bbe211f248313d83..08f73877f54418795093ce1007cac616fea27e84 100644 (file)
--- a/tests/data/ctf-traces/intersection/nostream/metadata
+++ b/tests/data/ctf-traces/intersection/nostream/metadata
@@ -3,7 +3,7 @@
 trace {
        major = 1;
        minor = 8;
-       uuid = "a967fbc0-c89b-4b92-b5df-30688d576ddf";
+       uuid = "40931b4f-3f84-48ef-aa1e-f8aab3209724";
        byte_order = be;
        packet.header := struct {
                integer { size = 32; align = 8; signed = false; encoding = none; base = decimal; byte_order = be; } magic;
@@ -18,7 +18,7 @@ env {
 
 clock {
        name = test_clock;
-       uuid = "fb759646-b2b9-42d7-9013-f790694dd902";
+       uuid = "3f2488d7-4617-4d08-9bf3-280008591f86";
        description = "This is a test clock";
        freq = 1000000000;
        precision = 10;

diff --git a/tests/data/ctf-traces/intersection/onestream/metadata b/tests/data/ctf-traces/intersection/onestream/metadata
index 5e14a71be411853c6b54c832bbe211f248313d83..19ce9326069d1e55470cdae2dfa74c85cf8ba7af 100644 (file)
--- a/tests/data/ctf-traces/intersection/onestream/metadata
+++ b/tests/data/ctf-traces/intersection/onestream/metadata
@@ -3,7 +3,7 @@
 trace {
        major = 1;
        minor = 8;
-       uuid = "a967fbc0-c89b-4b92-b5df-30688d576ddf";
+       uuid = "a8d0738a-4a6d-466b-83a7-8ab3c387d5bb";
        byte_order = be;
        packet.header := struct {
                integer { size = 32; align = 8; signed = false; encoding = none; base = decimal; byte_order = be; } magic;
@@ -18,7 +18,7 @@ env {
 
 clock {
        name = test_clock;
-       uuid = "fb759646-b2b9-42d7-9013-f790694dd902";
+       uuid = "1fb54d69-571c-49a1-9a34-084c7f3a5b33";
        description = "This is a test clock";
        freq = 1000000000;
        precision = 10;