Merge pull request #37 from compudj/master

Merge new tests

diff --git a/tests/1.8/regression/metadata/pass/clock-negative-offset-s/metadata b/tests/1.8/regression/metadata/pass/clock-negative-offset-s/metadata
new file mode 100644 (file)
index 0000000..aefda63
--- /dev/null
+++ b/tests/1.8/regression/metadata/pass/clock-negative-offset-s/metadata
@@ -0,0 +1,12 @@
+/* CTF 1.8 */
+
+trace {
+       major = 1;
+       minor = 8;
+       byte_order = le;
+};
+
+clock {
+       name = "test";
+       offset_s = -1000;
+};

diff --git a/tests/1.8/regression/metadata/pass/clock-negative-offset/metadata b/tests/1.8/regression/metadata/pass/clock-negative-offset/metadata
new file mode 100644 (file)
index 0000000..9fdf795
--- /dev/null
+++ b/tests/1.8/regression/metadata/pass/clock-negative-offset/metadata
@@ -0,0 +1,12 @@
+/* CTF 1.8 */
+
+trace {
+       major = 1;
+       minor = 8;
+       byte_order = le;
+};
+
+clock {
+       name = "test";
+       offset = -1000;
+};

diff --git a/tests/1.8/regression/metadata/pass/enum-multi-label/metadata b/tests/1.8/regression/metadata/pass/enum-multi-label/metadata
new file mode 100644 (file)
index 0000000..1b9e644
--- /dev/null
+++ b/tests/1.8/regression/metadata/pass/enum-multi-label/metadata
@@ -0,0 +1,28 @@
+/* CTF 1.8 */
+typealias integer { size = 8; align = 8; signed = false; base = 10; } := uint8_t;
+typealias integer { size = 32; align = 32; signed = false; base = hex; } := uint32_t;
+typealias integer { size = 32; align = 32; signed = true; base = hex; } := TYPE;
+
+trace {
+       major = 0;
+       minor = 1;
+       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+               uint8_t  uuid[16];
+       };
+};
+
+/* It is valid to have many labels mapping to a single value. */
+event {
+       name = string;
+       fields := struct {
+          enum : TYPE {
+                 VAL1 = 2,
+                 VAL2 = 2,
+                 VAL3 = 2,
+                 VAL4 = 2,
+          } field;
+       };
+};

diff --git a/tests/1.8/regression/metadata/pass/enum-range-label/metadata b/tests/1.8/regression/metadata/pass/enum-range-label/metadata
new file mode 100644 (file)
index 0000000..bae76c3
--- /dev/null
+++ b/tests/1.8/regression/metadata/pass/enum-range-label/metadata
@@ -0,0 +1,26 @@
+/* CTF 1.8 */
+typealias integer { size = 8; align = 8; signed = false; base = 10; } := uint8_t;
+typealias integer { size = 32; align = 32; signed = false; base = hex; } := uint32_t;
+typealias integer { size = 32; align = 32; signed = true; base = hex; } := TYPE;
+
+trace {
+       major = 0;
+       minor = 1;
+       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+               uint8_t  uuid[16];
+       };
+};
+
+/* Test label with non-overlapping range. */
+event {
+       name = string;
+       fields := struct {
+          enum : TYPE {
+                 VAL1 = 5 ... 8,
+                 VAL2 = 7 ... 10,
+          } field;
+       };
+};

diff --git a/tests/1.8/regression/metadata/pass/enum-range-overlap-label/metadata b/tests/1.8/regression/metadata/pass/enum-range-overlap-label/metadata
new file mode 100644 (file)
index 0000000..72f215f
--- /dev/null
+++ b/tests/1.8/regression/metadata/pass/enum-range-overlap-label/metadata
@@ -0,0 +1,26 @@
+/* CTF 1.8 */
+typealias integer { size = 8; align = 8; signed = false; base = 10; } := uint8_t;
+typealias integer { size = 32; align = 32; signed = false; base = hex; } := uint32_t;
+typealias integer { size = 32; align = 32; signed = true; base = hex; } := TYPE;
+
+trace {
+       major = 0;
+       minor = 1;
+       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+               uint8_t  uuid[16];
+       };
+};
+
+/* Test label with overlapping range. */
+event {
+       name = string;
+       fields := struct {
+          enum : TYPE {
+                 VAL1 = 5 ... 9,
+                 VAL2 = 7 ... 10,
+          } field;
+       };
+};

diff --git a/tests/1.8/regression/metadata/pass/enum-repeat-entry-string/metadata b/tests/1.8/regression/metadata/pass/enum-repeat-entry-string/metadata
new file mode 100644 (file)
index 0000000..64b72dc
--- /dev/null
+++ b/tests/1.8/regression/metadata/pass/enum-repeat-entry-string/metadata
@@ -0,0 +1,27 @@
+/* CTF 1.8 */
+typealias integer { size = 8; align = 8; signed = false; base = 10; } := uint8_t;
+typealias integer { size = 32; align = 32; signed = false; base = hex; } := uint32_t;
+typealias integer { size = 32; align = 32; signed = true; base = hex; } := TYPE;
+
+trace {
+       major = 0;
+       minor = 1;
+       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+               uint8_t  uuid[16];
+       };
+};
+
+/* Value -128 is the min value of TYPE. */
+event {
+       name = string;
+       fields := struct {
+          enum : TYPE {
+                 VAL1 = 0,
+                 VAL2 = 1,
+                 VAL1 = 2,
+          } field;
+       };
+};

diff --git a/tests/1.8/regression/metadata/pass/stream-undefined-id/metadata b/tests/1.8/regression/metadata/pass/stream-undefined-id/metadata
index e112d269703fe06b00a71b88c5eda36c4e827804..df67d6306a1d04d01992b75f79b6642b421e1ac4 100644 (file)
--- a/tests/1.8/regression/metadata/pass/stream-undefined-id/metadata
+++ b/tests/1.8/regression/metadata/pass/stream-undefined-id/metadata
@@ -15,6 +15,9 @@ trace {
 
 stream {
        id = 0;
+       event.header := struct {
+               integer { size = 32; align = 8; signed = false; encoding = none; base = decimal; byte_order = le; } id;
+       };
 };
 
 event {