Merge pull request #13 from compudj/master

Pull updates

diff --git a/tests/1.8/regression/metadata/fail/enum-empty/metadata b/tests/1.8/regression/metadata/fail/enum-empty/metadata
new file mode 100644 (file)
index 0000000..8fda8b1
--- /dev/null
+++ b/tests/1.8/regression/metadata/fail/enum-empty/metadata
@@ -0,0 +1,24 @@
+/* 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 = false; base = hex; } := int;
+
+trace {
+       major = 0;
+       minor = 1;
+       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+               uint8_t  uuid[16];
+       };
+};
+
+event {
+       name = string;
+       fields := struct {
+          // To be specified into the standard.
+          enum {} field;
+       };
+};

diff --git a/tests/1.8/regression/metadata/fail/event-id-string/metadata b/tests/1.8/regression/metadata/fail/event-id-string/metadata
new file mode 100644 (file)
index 0000000..bb741a9
--- /dev/null
+++ b/tests/1.8/regression/metadata/fail/event-id-string/metadata
@@ -0,0 +1,12 @@
+/* CTF 1.8 */
+
+trace {
+       major = 1;
+       minor = 8;
+       byte_order = le;
+};
+
+event {
+       name = "test";
+       id = "wrong";
+};

diff --git a/tests/1.8/regression/metadata/fail/event-id-struct/metadata b/tests/1.8/regression/metadata/fail/event-id-struct/metadata
new file mode 100644 (file)
index 0000000..25e932f
--- /dev/null
+++ b/tests/1.8/regression/metadata/fail/event-id-struct/metadata
@@ -0,0 +1,12 @@
+/* CTF 1.8 */
+
+trace {
+       major = 1;
+       minor = 8;
+       byte_order = le;
+};
+
+event {
+       name = "test";
+       id = struct {};
+};

diff --git a/tests/1.8/regression/metadata/pass/enum-empty/metadata b/tests/1.8/regression/metadata/pass/enum-empty/metadata
deleted file mode 100644 (file)
index 8fda8b1..0000000
--- a/tests/1.8/regression/metadata/pass/enum-empty/metadata
+++ /dev/null
@@ -1,24 +0,0 @@
-/* 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 = false; base = hex; } := int;
-
-trace {
-       major = 0;
-       minor = 1;
-       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-               uint8_t  uuid[16];
-       };
-};
-
-event {
-       name = string;
-       fields := struct {
-          // To be specified into the standard.
-          enum {} field;
-       };
-};

diff --git a/tests/1.8/regression/metadata/pass/event-id-integer/metadata b/tests/1.8/regression/metadata/pass/event-id-integer/metadata
new file mode 100644 (file)
index 0000000..551a950
--- /dev/null
+++ b/tests/1.8/regression/metadata/pass/event-id-integer/metadata
@@ -0,0 +1,12 @@
+/* CTF 1.8 */
+
+trace {
+       major = 1;
+       minor = 8;
+       byte_order = le;
+};
+
+event {
+       name = "test";
+       id = 0;
+};

diff --git a/tests/1.8/regression/stream/fail/content-size-larger-than-packet-size/dummystream b/tests/1.8/regression/stream/fail/content-size-larger-than-packet-size/dummystream
index 8281829cf27b474258b8c3ea6e60481a4ca84a5a..d7071fd48e803a2bdf0e77831f8e5bbb2f4bf576 100644 (file)
Binary files a/tests/1.8/regression/stream/fail/content-size-larger-than-packet-size/dummystream and b/tests/1.8/regression/stream/fail/content-size-larger-than-packet-size/dummystream differ

diff --git a/tests/1.8/regression/stream/fail/less-than-1-byte-packet-size/dummystream b/tests/1.8/regression/stream/fail/less-than-1-byte-packet-size/dummystream
new file mode 100644 (file)
index 0000000..8281829
Binary files /dev/null and b/tests/1.8/regression/stream/fail/less-than-1-byte-packet-size/dummystream differ

diff --git a/tests/1.8/regression/stream/fail/less-than-1-byte-packet-size/metadata b/tests/1.8/regression/stream/fail/less-than-1-byte-packet-size/metadata
new file mode 100644 (file)
index 0000000..724e550
--- /dev/null
+++ b/tests/1.8/regression/stream/fail/less-than-1-byte-packet-size/metadata
@@ -0,0 +1,25 @@
+/* CTF 1.8 */
+typealias integer { size = 8; align = 8; signed = false; base = 10; } := uint8_t;
+typealias integer { size = 32; align = 8; signed = false; base = hex; } := uint32_t;
+
+trace {
+       major = 0;
+       minor = 1;
+       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+               uint8_t  uuid[16];
+       };
+};
+
+stream {
+       packet.context := struct {
+               uint32_t packet_size;
+       };
+};
+
+event {
+       name = myevent;
+       fields := struct { uint32_t f; };
+};