Merge pull request #35 from compudj/master

Add pass/fail tests for events with undefined stream IDs

diff --git a/tests/1.8/regression/metadata/fail/stream-undefined-id/metadata b/tests/1.8/regression/metadata/fail/stream-undefined-id/metadata
new file mode 100644 (file)
index 0000000..a48700a
--- /dev/null
+++ b/tests/1.8/regression/metadata/fail/stream-undefined-id/metadata
@@ -0,0 +1,47 @@
+/* CTF 1.8 */
+trace {
+       major = 1;
+       minor = 8;
+       byte_order = le;
+       packet.header := struct {
+               integer { size = 32; align = 8; signed = false; encoding = none; base = decimal; byte_order = le; } stream_id;
+       };
+};
+
+/*
+ * Some events explicitly define stream_id = 0, some define stream_id = 1, and
+ * others don't specify a stream_id at all.
+ * This is not valid: if there are events not specifying a stream, then only
+ * stream_id = 0 is allowed.
+ */
+
+stream {
+       id = 0;
+};
+
+stream {
+       id = 1;
+};
+
+
+event {
+       id = 0;
+       name = "event0";
+};
+
+event {
+       id = 1;
+       name = "event1";
+       stream_id = 0;
+};
+
+event {
+       id = 2;
+       name = "event2";
+       stream_id = 1;
+};
+
+event {
+       id = 3;
+       name = "event3";
+};

diff --git a/tests/1.8/regression/metadata/pass/stream-undefined-id/metadata b/tests/1.8/regression/metadata/pass/stream-undefined-id/metadata
new file mode 100644 (file)
index 0000000..e112d26
--- /dev/null
+++ b/tests/1.8/regression/metadata/pass/stream-undefined-id/metadata
@@ -0,0 +1,39 @@
+/* CTF 1.8 */
+trace {
+       major = 1;
+       minor = 8;
+       byte_order = le;
+       packet.header := struct {
+               integer { size = 32; align = 8; signed = false; encoding = none; base = decimal; byte_order = le; } stream_id;
+       };
+};
+
+/*
+ * Some events explicitly define stream_id = 0, others don't specify a stream_id
+ * at all. This should be valid, as long as no other stream is defined.
+ */
+
+stream {
+       id = 0;
+};
+
+event {
+       id = 0;
+       name = "event0";
+};
+
+event {
+       id = 1;
+       name = "event1";
+};
+
+event {
+       id = 2;
+       name = "event2";
+       stream_id = 0;
+};
+
+event {
+       id = 3;
+       name = "event3";
+};