Split tests into 1.8 vs 1.9 subdirs

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/README b/README
index ccc2567e3c4df0c1595a26d33ad4eb5cb63a672b..f10f8adc415eae6f8be605cd25c24d197d4245a1 100644 (file)
--- a/README
+++ b/README
@@ -4,5 +4,5 @@ ctf-testsuite
 The Common Trace Format (CTF) testsuite is intended to validate the conformance of CTF readers.
 
 To run the testsuite simply export CTF_READER_BIN="$YOUR_CTF_READER" and
-use the run.sh script found in the tests/ folder.
-
+use the run.sh script found in the tests/1.8/ or tests/1.9/ folder,
+depending on the CTF specification version you want to check.

diff --git a/tests/1.8/fail/empty/metadata b/tests/1.8/fail/empty/metadata
new file mode 100644 (file)
index 0000000..7a459fa
--- /dev/null
+++ b/tests/1.8/fail/empty/metadata
@@ -0,0 +1 @@
+/* CTF 1.8 */

diff --git a/tests/1.8/fail/fail1/dummystream b/tests/1.8/fail/fail1/dummystream
new file mode 100644 (file)
index 0000000..2601067
Binary files /dev/null and b/tests/1.8/fail/fail1/dummystream differ

diff --git a/tests/1.8/fail/fail1/metadata b/tests/1.8/fail/fail1/metadata
new file mode 100644 (file)
index 0000000..28185f5
--- /dev/null
+++ b/tests/1.8/fail/fail1/metadata
@@ -0,0 +1,49 @@
+/* CTF 1.8
+ *
+ * Architecture with 32-bit pointers, 32-bit integers, 32-bit longs.
+ */
+
+typealias integer { size = 1; align = 1; signed = false; } := uint1_t;
+typealias integer { size = 8; align = 8; signed = false; } := uint8_t;
+typealias integer { size = 63; align = 1; signed = false; } := timestamp_t;
+
+typealias integer { size = 32; align = 32; signed = false; base = 10; } := uint32_t;
+typealias integer { size = 32; align = 32; signed = false; } := void *;
+
+
+trace {
+       major = 0;
+       minor = 1;
+       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+               uint8_t  uuid[16];
+               uint32_t stream_id;
+       };
+};
+
+stream {
+       event.header := struct {
+               uint1_t id;
+               timestamp_t timestamp;
+       };
+       event.context := struct {
+               uint32_t thread_id;
+               uint32_t event_count;
+       };                      
+};
+
+event {
+       name = func_enter;
+       id = 0;
+       fields := struct {
+               void *func_called;
+               void *called_from;
+       };
+};
+
+event {
+       name = func_exit;
+       id = 1;
+};

diff --git a/tests/1.8/fail/fail2/metadata b/tests/1.8/fail/fail2/metadata
new file mode 100644 (file)
index 0000000..456661e
Binary files /dev/null and b/tests/1.8/fail/fail2/metadata differ

diff --git a/tests/1.8/fail/integer-range/metadata b/tests/1.8/fail/integer-range/metadata
new file mode 100644 (file)
index 0000000..3574940
--- /dev/null
+++ b/tests/1.8/fail/integer-range/metadata
@@ -0,0 +1,27 @@
+/* CTF 1.8 */
+typealias integer { size = 8; align = 8; signed = false; } := uint8_t;
+typealias integer { size = 32; align = 32; signed = false; } := uint32_t;
+
+trace {
+       /* Integer out of range */
+       major = 23452397856348975623897562893746589237465289374658923764598237645897234658723648579236;
+       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 content_size;
+               uint32_t packet_size;
+       };
+};
+
+event {
+       name = string;
+       fields := struct { string str; };
+};

diff --git a/tests/1.8/fail/list b/tests/1.8/fail/list
new file mode 100644 (file)
index 0000000..7188ec7
--- /dev/null
+++ b/tests/1.8/fail/list
@@ -0,0 +1,33 @@
+./test.sh empty/
+./test.sh types01/
+./test.sh types02/
+./test.sh types03/
+./test.sh types04/
+./test.sh types05/
+./test.sh types06/
+./test.sh types07/
+./test.sh types08/
+./test.sh types09/
+./test.sh types10/
+./test.sh types11/
+./test.sh types12/
+./test.sh types13/
+./test.sh types14/
+./test.sh types15/
+./test.sh types16/
+./test.sh types17/
+./test.sh types18/
+./test.sh types19/
+./test.sh types20/
+./test.sh types21/
+./test.sh types22/
+./test.sh types23/
+./test.sh types24/
+./test.sh types25/
+./test.sh types26/
+./test.sh fail1/
+./test.sh fail2/
+./test.sh integer-range/
+./test.sh lttng-modules-2.0-pre1/
+./test.sh packet-based-metadata/
+./test.sh smalltrace/

diff --git a/tests/1.8/fail/lttng-modules-2.0-pre1/metadata b/tests/1.8/fail/lttng-modules-2.0-pre1/metadata
new file mode 100755 (executable)
index 0000000..6f92a29
Binary files /dev/null and b/tests/1.8/fail/lttng-modules-2.0-pre1/metadata differ

diff --git a/tests/1.8/fail/packet-based-metadata/metadata b/tests/1.8/fail/packet-based-metadata/metadata
new file mode 100644 (file)
index 0000000..e209780
Binary files /dev/null and b/tests/1.8/fail/packet-based-metadata/metadata differ

diff --git a/tests/1.8/fail/run.sh b/tests/1.8/fail/run.sh
new file mode 100755 (executable)
index 0000000..d43ea19
--- /dev/null
+++ b/tests/1.8/fail/run.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+prove --exec '' --merge - < list

diff --git a/tests/1.8/fail/smalltrace/dummystream-fail b/tests/1.8/fail/smalltrace/dummystream-fail
new file mode 100644 (file)
index 0000000..fc7e07c
--- /dev/null
+++ b/tests/1.8/fail/smalltrace/dummystream-fail
@@ -0,0 +1 @@
+Á\1füÁ*d
\ No newline at end of file

diff --git a/tests/1.8/fail/smalltrace/metadata b/tests/1.8/fail/smalltrace/metadata
new file mode 100644 (file)
index 0000000..86f8e0a
--- /dev/null
+++ b/tests/1.8/fail/smalltrace/metadata
@@ -0,0 +1,19 @@
+/* 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;
+
+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 { string str; };
+};

diff --git a/tests/1.8/fail/test.sh b/tests/1.8/fail/test.sh
new file mode 100755 (executable)
index 0000000..8d9d62e
--- /dev/null
+++ b/tests/1.8/fail/test.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+# Copyright (C) - 2013 Christian Babeux <christian.babeux@efficios.com>
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License, version 2 only, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+CURDIR=$(dirname $0)
+UTILS_DIR=$CURDIR/../../../utils/
+
+source $UTILS_DIR/tap/tap.sh
+
+NUM_TESTS=1
+
+plan_tests $NUM_TESTS
+
+$CTF_READER_BIN $CTF_READER_OPTS $1 >/dev/null 2>&1
+
+result=$?
+
+is $result 1 $1

diff --git a/tests/1.8/fail/types01/metadata b/tests/1.8/fail/types01/metadata
new file mode 100644 (file)
index 0000000..f734c50
--- /dev/null
+++ b/tests/1.8/fail/types01/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: size = 0 */
+typealias integer { size = 0; align = 8; signed = false; } := uint0_t;    
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.8/fail/types02/metadata b/tests/1.8/fail/types02/metadata
new file mode 100644 (file)
index 0000000..64caaec
--- /dev/null
+++ b/tests/1.8/fail/types02/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: Alignment values must be power of two. */
+typealias integer { size = 8; align = 17; signed = false; } := uint0_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.8/fail/types03/metadata b/tests/1.8/fail/types03/metadata
new file mode 100644 (file)
index 0000000..66fdd53
--- /dev/null
+++ b/tests/1.8/fail/types03/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: invalid byte ordering. */
+typealias integer { size = 8; align = 8; signed = false; byte_order = iroquois; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.8/fail/types04/metadata b/tests/1.8/fail/types04/metadata
new file mode 100644 (file)
index 0000000..c3939db
--- /dev/null
+++ b/tests/1.8/fail/types04/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: invalid signed. */
+typealias integer { size = 8; align = 8; signed = svp; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.8/fail/types05/metadata b/tests/1.8/fail/types05/metadata
new file mode 100644 (file)
index 0000000..6d87f56
--- /dev/null
+++ b/tests/1.8/fail/types05/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: negative size. */
+typealias integer { size = -8; align = 8; signed = false; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.8/fail/types06/metadata b/tests/1.8/fail/types06/metadata
new file mode 100644 (file)
index 0000000..2d60c33
--- /dev/null
+++ b/tests/1.8/fail/types06/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: negative align. */
+typealias integer { size = 8; align = -8; signed = false; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.8/fail/types07/metadata b/tests/1.8/fail/types07/metadata
new file mode 100644 (file)
index 0000000..4b97a9c
--- /dev/null
+++ b/tests/1.8/fail/types07/metadata
@@ -0,0 +1,16 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+ 
+/* FAIL: size as string. */
+typealias integer { size = "8"; align = 8; signed = false; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.8/fail/types08/metadata b/tests/1.8/fail/types08/metadata
new file mode 100644 (file)
index 0000000..c2fd4af
--- /dev/null
+++ b/tests/1.8/fail/types08/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: align as string. */
+typealias integer { size = 8; align = "8"; signed = false; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.8/fail/types09/metadata b/tests/1.8/fail/types09/metadata
new file mode 100644 (file)
index 0000000..7f5f142
--- /dev/null
+++ b/tests/1.8/fail/types09/metadata
@@ -0,0 +1,16 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+ 
+/* FAIL: signed as string. */
+typealias integer { size = 8; align = 8; signed = "false"; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.8/fail/types10/metadata b/tests/1.8/fail/types10/metadata
new file mode 100644 (file)
index 0000000..86b6496
--- /dev/null
+++ b/tests/1.8/fail/types10/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: name is a keyword. */
+typealias integer { size = 8; align = 8; signed = "false"; } := trace;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.8/fail/types11/metadata b/tests/1.8/fail/types11/metadata
new file mode 100644 (file)
index 0000000..6ac5b82
--- /dev/null
+++ b/tests/1.8/fail/types11/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: missing size. */
+typealias integer { align = 8; signed = "false"; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.8/fail/types12/metadata b/tests/1.8/fail/types12/metadata
new file mode 100644 (file)
index 0000000..8057394
--- /dev/null
+++ b/tests/1.8/fail/types12/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+ 
+/* FAIL: invalid kind. */
+typealias entier { size = 8; align = 8; signed = false; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.8/fail/types13/metadata b/tests/1.8/fail/types13/metadata
new file mode 100644 (file)
index 0000000..d379426
--- /dev/null
+++ b/tests/1.8/fail/types13/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+ 
+/* FAIL: base as a string. */
+typealias integer { size = 8; align = 8; signed = false; base = "decimal"; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.8/fail/types14/metadata b/tests/1.8/fail/types14/metadata
new file mode 100644 (file)
index 0000000..051c230
--- /dev/null
+++ b/tests/1.8/fail/types14/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+ 
+/* FAIL: invalid base. */
+typealias integer { size = 8; align = 8; signed = false; base = orthogonal; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.8/fail/types15/metadata b/tests/1.8/fail/types15/metadata
new file mode 100644 (file)
index 0000000..6343188
--- /dev/null
+++ b/tests/1.8/fail/types15/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+ 
+/* FAIL: invalid encoding. */
+typealias integer { size = 8; align = 8; signed = false; encoding = true; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.8/fail/types16/metadata b/tests/1.8/fail/types16/metadata
new file mode 100644 (file)
index 0000000..4eeb883
--- /dev/null
+++ b/tests/1.8/fail/types16/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+ 
+/* FAIL: encoding as a string. */
+typealias integer { size = 8; align = 8; signed = false; encoding = "ascii"; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.8/fail/types17/metadata b/tests/1.8/fail/types17/metadata
new file mode 100644 (file)
index 0000000..abeee11
--- /dev/null
+++ b/tests/1.8/fail/types17/metadata
@@ -0,0 +1,19 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+typealias integer { size = 8; align = 8; signed = false; } := uint8_t;
+
+/* FAIL: out of range */
+enum dummy : uint8_t {
+  x = 1024
+};
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.8/fail/types18/metadata b/tests/1.8/fail/types18/metadata
new file mode 100644 (file)
index 0000000..3477e20
--- /dev/null
+++ b/tests/1.8/fail/types18/metadata
@@ -0,0 +1,18 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: out of range */
+enum dummy : uint32_t {
+  x = -1
+};
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.8/fail/types19/metadata b/tests/1.8/fail/types19/metadata
new file mode 100644 (file)
index 0000000..6d88bad
--- /dev/null
+++ b/tests/1.8/fail/types19/metadata
@@ -0,0 +1,18 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: implicite type int, but undefined. */
+enum dummy {
+  x = 1024
+};
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.8/fail/types20/metadata b/tests/1.8/fail/types20/metadata
new file mode 100644 (file)
index 0000000..7f7405c
--- /dev/null
+++ b/tests/1.8/fail/types20/metadata
@@ -0,0 +1,19 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: type int, but undefined. */
+struct dummy {
+  int xxx;
+};
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.8/fail/types21/metadata b/tests/1.8/fail/types21/metadata
new file mode 100644 (file)
index 0000000..9933b4e
--- /dev/null
+++ b/tests/1.8/fail/types21/metadata
@@ -0,0 +1,20 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: duplicate name */
+struct dummy {
+  uint32_t xxx;
+  uint32_t xxx;
+};
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.8/fail/types22/metadata b/tests/1.8/fail/types22/metadata
new file mode 100644 (file)
index 0000000..eb05c32
--- /dev/null
+++ b/tests/1.8/fail/types22/metadata
@@ -0,0 +1,23 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: duplicate name. */
+struct a {
+  uint32_t xxx;
+};
+
+struct a {
+  uint32_t xxx;
+};
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.8/fail/types23/metadata b/tests/1.8/fail/types23/metadata
new file mode 100644 (file)
index 0000000..326f730
--- /dev/null
+++ b/tests/1.8/fail/types23/metadata
@@ -0,0 +1,17 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: duplicate name. */
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.8/fail/types24/metadata b/tests/1.8/fail/types24/metadata
new file mode 100644 (file)
index 0000000..666933a
--- /dev/null
+++ b/tests/1.8/fail/types24/metadata
@@ -0,0 +1,20 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: keyword as a field. */
+struct a {
+  uint32_t trace;
+};
+
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.8/fail/types25/metadata b/tests/1.8/fail/types25/metadata
new file mode 100644 (file)
index 0000000..5ca0fb5
--- /dev/null
+++ b/tests/1.8/fail/types25/metadata
@@ -0,0 +1,20 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: keyword as a field. */
+struct a {
+  uint32_t x;
+} align(-1);
+
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.8/fail/types26/metadata b/tests/1.8/fail/types26/metadata
new file mode 100644 (file)
index 0000000..3d1b760
--- /dev/null
+++ b/tests/1.8/fail/types26/metadata
@@ -0,0 +1,17 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: negative array. */
+typedef uint32_t name[-1];
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.8/pass/env-warning/dummystream b/tests/1.8/pass/env-warning/dummystream
new file mode 100644 (file)
index 0000000..53d735e
Binary files /dev/null and b/tests/1.8/pass/env-warning/dummystream differ

diff --git a/tests/1.8/pass/env-warning/metadata b/tests/1.8/pass/env-warning/metadata
new file mode 100644 (file)
index 0000000..f3618e2
--- /dev/null
+++ b/tests/1.8/pass/env-warning/metadata
@@ -0,0 +1,30 @@
+/* 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;
+
+trace {
+       major = 0;
+       minor = 1;
+       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+               uint8_t  uuid[16];
+       };
+};
+
+env {
+       dummy = "blah";
+};
+
+stream {
+       packet.context := struct {
+               uint32_t content_size;
+               uint32_t packet_size;
+       };
+};
+
+event {
+       name = string;
+       fields := struct { string str; };
+};

diff --git a/tests/1.8/pass/list b/tests/1.8/pass/list
new file mode 100644 (file)
index 0000000..ef5388d
--- /dev/null
+++ b/tests/1.8/pass/list
@@ -0,0 +1,12 @@
+./test.sh env-warning/
+./test.sh lttng-modules-2.0-pre5/
+./test.sh smalltrace/
+./test.sh succeed1/
+./test.sh succeed2/
+./test.sh succeed4/
+./test.sh string-concat/
+./test.sh string-literal-escape/
+./test.sh test/
+./test.sh warnings/
+./test.sh wk-heartbeat-u/
+./test.sh minimal/

diff --git a/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_0 b/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_0
new file mode 100755 (executable)
index 0000000..528aa6c
Binary files /dev/null and b/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_0 differ

diff --git a/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_1 b/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_1
new file mode 100755 (executable)
index 0000000..41ac45a
Binary files /dev/null and b/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_1 differ

diff --git a/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_2 b/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_2
new file mode 100755 (executable)
index 0000000..b6fc7f7
Binary files /dev/null and b/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_2 differ

diff --git a/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_3 b/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_3
new file mode 100755 (executable)
index 0000000..b79f6cb
Binary files /dev/null and b/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_3 differ

diff --git a/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_4 b/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_4
new file mode 100755 (executable)
index 0000000..3ff7ea5
Binary files /dev/null and b/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_4 differ

diff --git a/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_5 b/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_5
new file mode 100755 (executable)
index 0000000..ed41169
Binary files /dev/null and b/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_5 differ

diff --git a/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_6 b/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_6
new file mode 100755 (executable)
index 0000000..89502f0
Binary files /dev/null and b/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_6 differ

diff --git a/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_7 b/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_7
new file mode 100755 (executable)
index 0000000..1199fac
Binary files /dev/null and b/tests/1.8/pass/lttng-modules-2.0-pre5/channel0_7 differ

diff --git a/tests/1.8/pass/lttng-modules-2.0-pre5/metadata b/tests/1.8/pass/lttng-modules-2.0-pre5/metadata
new file mode 100755 (executable)
index 0000000..de5959a
Binary files /dev/null and b/tests/1.8/pass/lttng-modules-2.0-pre5/metadata differ

diff --git a/tests/1.8/pass/minimal/metadata b/tests/1.8/pass/minimal/metadata
new file mode 100644 (file)
index 0000000..7a459fa
--- /dev/null
+++ b/tests/1.8/pass/minimal/metadata
@@ -0,0 +1 @@
+/* CTF 1.8 */

diff --git a/tests/1.8/pass/run.sh b/tests/1.8/pass/run.sh
new file mode 100755 (executable)
index 0000000..d43ea19
--- /dev/null
+++ b/tests/1.8/pass/run.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+prove --exec '' --merge - < list

diff --git a/tests/1.8/pass/smalltrace/dummystream b/tests/1.8/pass/smalltrace/dummystream
new file mode 100644 (file)
index 0000000..469cb9a
Binary files /dev/null and b/tests/1.8/pass/smalltrace/dummystream differ

diff --git a/tests/1.8/pass/smalltrace/metadata b/tests/1.8/pass/smalltrace/metadata
new file mode 100644 (file)
index 0000000..86f8e0a
--- /dev/null
+++ b/tests/1.8/pass/smalltrace/metadata
@@ -0,0 +1,19 @@
+/* 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;
+
+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 { string str; };
+};

diff --git a/tests/1.8/pass/string-concat/metadata b/tests/1.8/pass/string-concat/metadata
new file mode 100644 (file)
index 0000000..d4440b8
--- /dev/null
+++ b/tests/1.8/pass/string-concat/metadata
@@ -0,0 +1,5 @@
+/* CTF 1.8 */
+
+trace {
+       test = "abc" "def";
+};

diff --git a/tests/1.8/pass/string-literal-escape/dummystream b/tests/1.8/pass/string-literal-escape/dummystream
new file mode 100644 (file)
index 0000000..53d735e
Binary files /dev/null and b/tests/1.8/pass/string-literal-escape/dummystream differ

diff --git a/tests/1.8/pass/string-literal-escape/metadata b/tests/1.8/pass/string-literal-escape/metadata
new file mode 100644 (file)
index 0000000..71d6c18
--- /dev/null
+++ b/tests/1.8/pass/string-literal-escape/metadata
@@ -0,0 +1,41 @@
+/* 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;
+
+trace {
+       major = 0;
+       minor = 1;
+       test2 = "?\x20\040\123\0?";
+       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+               uint8_t  uuid[16];
+       };
+};
+
+/* use babeltrace -f trace:hostname to print. */
+
+/*
+ * Expected:
+
+abc " hex: A, #, #, #1,
+oct: A, #, #, #1,
+
+ */
+
+env {
+       hostname = "\nabc \" hex: \x41, \x23, \x023, \x0231,\noct: \101, \043, \43, \0431, \0NOT SEEN";
+};
+
+stream {
+       packet.context := struct {
+               uint32_t content_size;
+               uint32_t packet_size;
+       };
+};
+
+event {
+       name = string;
+       fields := struct { string str; };
+};

diff --git a/tests/1.8/pass/succeed1/dummystream b/tests/1.8/pass/succeed1/dummystream
new file mode 100644 (file)
index 0000000..53d735e
Binary files /dev/null and b/tests/1.8/pass/succeed1/dummystream differ

diff --git a/tests/1.8/pass/succeed1/metadata b/tests/1.8/pass/succeed1/metadata
new file mode 100644 (file)
index 0000000..f88ffb0
--- /dev/null
+++ b/tests/1.8/pass/succeed1/metadata
@@ -0,0 +1,26 @@
+/* CTF 1.8 */
+typealias integer { size = 8; align = 8; signed = false; } := uint8_t;
+typealias integer { size = 32; align = 32; signed = false; } := 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 content_size;
+               uint32_t packet_size;
+       };
+};
+
+event {
+       name = string;
+       fields := struct { string str; };
+};

diff --git a/tests/1.8/pass/succeed2/dummystream b/tests/1.8/pass/succeed2/dummystream
new file mode 100644 (file)
index 0000000..53d735e
Binary files /dev/null and b/tests/1.8/pass/succeed2/dummystream differ

diff --git a/tests/1.8/pass/succeed2/metadata b/tests/1.8/pass/succeed2/metadata
new file mode 100644 (file)
index 0000000..10a288f
--- /dev/null
+++ b/tests/1.8/pass/succeed2/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;
+
+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 content_size;
+               uint32_t packet_size;
+       };
+};
+
+event {
+       name = string;
+       fields := struct { string str; };
+};

diff --git a/tests/1.8/pass/succeed4/metadata b/tests/1.8/pass/succeed4/metadata
new file mode 100644 (file)
index 0000000..a3d401a
--- /dev/null
+++ b/tests/1.8/pass/succeed4/metadata
@@ -0,0 +1,31 @@
+/* CTF 1.8 */
+typealias integer { size = 8; align = 8; signed = false; } := uint8_t;
+typealias integer { size = 32; align = 32; signed = false; } := uint32_t;
+
+trace {
+       major = 0;
+       minor = 1;
+       test = 0xABC234;        /* hexadecimal */
+       test1 = 06534;          /* octal */
+       test2 = 1234;           /* decimal */
+       test3 = +1234;          /* decimal with + unary op */
+       test4 = -1234;          /* decimal (negated) */
+       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 content_size;
+               uint32_t packet_size;
+       };
+};
+
+event {
+       name = string;
+       fields := struct { string str; };
+};

diff --git a/tests/1.8/pass/test.sh b/tests/1.8/pass/test.sh
new file mode 100755 (executable)
index 0000000..e4506a3
--- /dev/null
+++ b/tests/1.8/pass/test.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+# Copyright (C) - 2013 Christian Babeux <christian.babeux@efficios.com>
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License, version 2 only, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+CURDIR=$(dirname $0)
+UTILS_DIR=$CURDIR/../../../utils/
+
+source $UTILS_DIR/tap/tap.sh
+
+NUM_TESTS=1
+
+plan_tests $NUM_TESTS
+
+$CTF_READER_BIN $CTF_READER_OPTS $1 >/dev/null 2>&1
+
+result=$?
+
+is $result 0 $1

diff --git a/tests/1.8/pass/test/channel0_0 b/tests/1.8/pass/test/channel0_0
new file mode 100755 (executable)
index 0000000..528aa6c
Binary files /dev/null and b/tests/1.8/pass/test/channel0_0 differ

diff --git a/tests/1.8/pass/test/channel0_1 b/tests/1.8/pass/test/channel0_1
new file mode 100755 (executable)
index 0000000..41ac45a
Binary files /dev/null and b/tests/1.8/pass/test/channel0_1 differ

diff --git a/tests/1.8/pass/test/channel0_2 b/tests/1.8/pass/test/channel0_2
new file mode 100755 (executable)
index 0000000..b6fc7f7
Binary files /dev/null and b/tests/1.8/pass/test/channel0_2 differ

diff --git a/tests/1.8/pass/test/channel0_3 b/tests/1.8/pass/test/channel0_3
new file mode 100755 (executable)
index 0000000..b79f6cb
Binary files /dev/null and b/tests/1.8/pass/test/channel0_3 differ

diff --git a/tests/1.8/pass/test/channel0_4 b/tests/1.8/pass/test/channel0_4
new file mode 100755 (executable)
index 0000000..3ff7ea5
Binary files /dev/null and b/tests/1.8/pass/test/channel0_4 differ

diff --git a/tests/1.8/pass/test/channel0_5 b/tests/1.8/pass/test/channel0_5
new file mode 100755 (executable)
index 0000000..ed41169
Binary files /dev/null and b/tests/1.8/pass/test/channel0_5 differ

diff --git a/tests/1.8/pass/test/channel0_6 b/tests/1.8/pass/test/channel0_6
new file mode 100755 (executable)
index 0000000..89502f0
Binary files /dev/null and b/tests/1.8/pass/test/channel0_6 differ

diff --git a/tests/1.8/pass/test/channel0_7 b/tests/1.8/pass/test/channel0_7
new file mode 100755 (executable)
index 0000000..1199fac
Binary files /dev/null and b/tests/1.8/pass/test/channel0_7 differ

diff --git a/tests/1.8/pass/test/metadata b/tests/1.8/pass/test/metadata
new file mode 100755 (executable)
index 0000000..de5959a
Binary files /dev/null and b/tests/1.8/pass/test/metadata differ

diff --git a/tests/1.8/pass/warnings/dummystream b/tests/1.8/pass/warnings/dummystream
new file mode 100644 (file)
index 0000000..53d735e
Binary files /dev/null and b/tests/1.8/pass/warnings/dummystream differ

diff --git a/tests/1.8/pass/warnings/metadata b/tests/1.8/pass/warnings/metadata
new file mode 100644 (file)
index 0000000..30ca784
--- /dev/null
+++ b/tests/1.8/pass/warnings/metadata
@@ -0,0 +1,29 @@
+/* CTF 1.8 */
+typealias integer { size = 8; align = 8; signed = false; aa = bb; } := uint8_t;
+typealias integer { size = 32; align = 32; signed = false; zz = aa; } := 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];
+       };
+       blah = "aaa";
+};
+
+stream {
+       packet.context := struct {
+               uint32_t content_size;
+               uint32_t packet_size;
+       };
+       askdjfhaskdjfh = 1;
+};
+
+event {
+       name = string;
+       fields := struct { string str; };
+       asdjfhah := struct { uint8_t ffff; };
+};

diff --git a/tests/1.8/pass/wk-heartbeat-u/metadata b/tests/1.8/pass/wk-heartbeat-u/metadata
new file mode 100755 (executable)
index 0000000..e35f463
Binary files /dev/null and b/tests/1.8/pass/wk-heartbeat-u/metadata differ

diff --git a/tests/1.8/pass/wk-heartbeat-u/u_0 b/tests/1.8/pass/wk-heartbeat-u/u_0
new file mode 100755 (executable)
index 0000000..3af2cdc
Binary files /dev/null and b/tests/1.8/pass/wk-heartbeat-u/u_0 differ

diff --git a/tests/1.8/pass/wk-heartbeat-u/u_1 b/tests/1.8/pass/wk-heartbeat-u/u_1
new file mode 100755 (executable)
index 0000000..7b74c03
Binary files /dev/null and b/tests/1.8/pass/wk-heartbeat-u/u_1 differ

diff --git a/tests/1.8/pass/wk-heartbeat-u/u_2 b/tests/1.8/pass/wk-heartbeat-u/u_2
new file mode 100755 (executable)
index 0000000..13a69fc
Binary files /dev/null and b/tests/1.8/pass/wk-heartbeat-u/u_2 differ

diff --git a/tests/1.8/pass/wk-heartbeat-u/u_3 b/tests/1.8/pass/wk-heartbeat-u/u_3
new file mode 100755 (executable)
index 0000000..1cdde72
Binary files /dev/null and b/tests/1.8/pass/wk-heartbeat-u/u_3 differ

diff --git a/tests/1.8/pass/wk-heartbeat-u/u_4 b/tests/1.8/pass/wk-heartbeat-u/u_4
new file mode 100755 (executable)
index 0000000..c136034
Binary files /dev/null and b/tests/1.8/pass/wk-heartbeat-u/u_4 differ

diff --git a/tests/1.8/pass/wk-heartbeat-u/u_5 b/tests/1.8/pass/wk-heartbeat-u/u_5
new file mode 100755 (executable)
index 0000000..a0a5881
Binary files /dev/null and b/tests/1.8/pass/wk-heartbeat-u/u_5 differ

diff --git a/tests/1.8/pass/wk-heartbeat-u/u_6 b/tests/1.8/pass/wk-heartbeat-u/u_6
new file mode 100755 (executable)
index 0000000..b1c8520
Binary files /dev/null and b/tests/1.8/pass/wk-heartbeat-u/u_6 differ

diff --git a/tests/1.8/pass/wk-heartbeat-u/u_7 b/tests/1.8/pass/wk-heartbeat-u/u_7
new file mode 100755 (executable)
index 0000000..05f7393
Binary files /dev/null and b/tests/1.8/pass/wk-heartbeat-u/u_7 differ

diff --git a/tests/1.8/run.sh b/tests/1.8/run.sh
new file mode 100755 (executable)
index 0000000..8556098
--- /dev/null
+++ b/tests/1.8/run.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+#pass/run.sh
+
+cd fail/
+./run.sh

diff --git a/tests/1.9/fail/empty/metadata b/tests/1.9/fail/empty/metadata
new file mode 100644 (file)
index 0000000..7a459fa
--- /dev/null
+++ b/tests/1.9/fail/empty/metadata
@@ -0,0 +1 @@
+/* CTF 1.8 */

diff --git a/tests/1.9/fail/fail1/dummystream b/tests/1.9/fail/fail1/dummystream
new file mode 100644 (file)
index 0000000..2601067
Binary files /dev/null and b/tests/1.9/fail/fail1/dummystream differ

diff --git a/tests/1.9/fail/fail1/metadata b/tests/1.9/fail/fail1/metadata
new file mode 100644 (file)
index 0000000..28185f5
--- /dev/null
+++ b/tests/1.9/fail/fail1/metadata
@@ -0,0 +1,49 @@
+/* CTF 1.8
+ *
+ * Architecture with 32-bit pointers, 32-bit integers, 32-bit longs.
+ */
+
+typealias integer { size = 1; align = 1; signed = false; } := uint1_t;
+typealias integer { size = 8; align = 8; signed = false; } := uint8_t;
+typealias integer { size = 63; align = 1; signed = false; } := timestamp_t;
+
+typealias integer { size = 32; align = 32; signed = false; base = 10; } := uint32_t;
+typealias integer { size = 32; align = 32; signed = false; } := void *;
+
+
+trace {
+       major = 0;
+       minor = 1;
+       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+               uint8_t  uuid[16];
+               uint32_t stream_id;
+       };
+};
+
+stream {
+       event.header := struct {
+               uint1_t id;
+               timestamp_t timestamp;
+       };
+       event.context := struct {
+               uint32_t thread_id;
+               uint32_t event_count;
+       };                      
+};
+
+event {
+       name = func_enter;
+       id = 0;
+       fields := struct {
+               void *func_called;
+               void *called_from;
+       };
+};
+
+event {
+       name = func_exit;
+       id = 1;
+};

diff --git a/tests/1.9/fail/fail2/metadata b/tests/1.9/fail/fail2/metadata
new file mode 100644 (file)
index 0000000..456661e
Binary files /dev/null and b/tests/1.9/fail/fail2/metadata differ

diff --git a/tests/1.9/fail/integer-range/metadata b/tests/1.9/fail/integer-range/metadata
new file mode 100644 (file)
index 0000000..3574940
--- /dev/null
+++ b/tests/1.9/fail/integer-range/metadata
@@ -0,0 +1,27 @@
+/* CTF 1.8 */
+typealias integer { size = 8; align = 8; signed = false; } := uint8_t;
+typealias integer { size = 32; align = 32; signed = false; } := uint32_t;
+
+trace {
+       /* Integer out of range */
+       major = 23452397856348975623897562893746589237465289374658923764598237645897234658723648579236;
+       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 content_size;
+               uint32_t packet_size;
+       };
+};
+
+event {
+       name = string;
+       fields := struct { string str; };
+};

diff --git a/tests/1.9/fail/list b/tests/1.9/fail/list
new file mode 100644 (file)
index 0000000..7188ec7
--- /dev/null
+++ b/tests/1.9/fail/list
@@ -0,0 +1,33 @@
+./test.sh empty/
+./test.sh types01/
+./test.sh types02/
+./test.sh types03/
+./test.sh types04/
+./test.sh types05/
+./test.sh types06/
+./test.sh types07/
+./test.sh types08/
+./test.sh types09/
+./test.sh types10/
+./test.sh types11/
+./test.sh types12/
+./test.sh types13/
+./test.sh types14/
+./test.sh types15/
+./test.sh types16/
+./test.sh types17/
+./test.sh types18/
+./test.sh types19/
+./test.sh types20/
+./test.sh types21/
+./test.sh types22/
+./test.sh types23/
+./test.sh types24/
+./test.sh types25/
+./test.sh types26/
+./test.sh fail1/
+./test.sh fail2/
+./test.sh integer-range/
+./test.sh lttng-modules-2.0-pre1/
+./test.sh packet-based-metadata/
+./test.sh smalltrace/

diff --git a/tests/1.9/fail/lttng-modules-2.0-pre1/metadata b/tests/1.9/fail/lttng-modules-2.0-pre1/metadata
new file mode 100755 (executable)
index 0000000..6f92a29
Binary files /dev/null and b/tests/1.9/fail/lttng-modules-2.0-pre1/metadata differ

diff --git a/tests/1.9/fail/packet-based-metadata/metadata b/tests/1.9/fail/packet-based-metadata/metadata
new file mode 100644 (file)
index 0000000..e209780
Binary files /dev/null and b/tests/1.9/fail/packet-based-metadata/metadata differ

diff --git a/tests/1.9/fail/run.sh b/tests/1.9/fail/run.sh
new file mode 100755 (executable)
index 0000000..d43ea19
--- /dev/null
+++ b/tests/1.9/fail/run.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+prove --exec '' --merge - < list

diff --git a/tests/1.9/fail/smalltrace/dummystream-fail b/tests/1.9/fail/smalltrace/dummystream-fail
new file mode 100644 (file)
index 0000000..fc7e07c
--- /dev/null
+++ b/tests/1.9/fail/smalltrace/dummystream-fail
@@ -0,0 +1 @@
+Á\1füÁ*d
\ No newline at end of file

diff --git a/tests/1.9/fail/smalltrace/metadata b/tests/1.9/fail/smalltrace/metadata
new file mode 100644 (file)
index 0000000..86f8e0a
--- /dev/null
+++ b/tests/1.9/fail/smalltrace/metadata
@@ -0,0 +1,19 @@
+/* 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;
+
+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 { string str; };
+};

diff --git a/tests/1.9/fail/test.sh b/tests/1.9/fail/test.sh
new file mode 100755 (executable)
index 0000000..8d9d62e
--- /dev/null
+++ b/tests/1.9/fail/test.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+# Copyright (C) - 2013 Christian Babeux <christian.babeux@efficios.com>
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License, version 2 only, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+CURDIR=$(dirname $0)
+UTILS_DIR=$CURDIR/../../../utils/
+
+source $UTILS_DIR/tap/tap.sh
+
+NUM_TESTS=1
+
+plan_tests $NUM_TESTS
+
+$CTF_READER_BIN $CTF_READER_OPTS $1 >/dev/null 2>&1
+
+result=$?
+
+is $result 1 $1

diff --git a/tests/1.9/fail/types01/metadata b/tests/1.9/fail/types01/metadata
new file mode 100644 (file)
index 0000000..f734c50
--- /dev/null
+++ b/tests/1.9/fail/types01/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: size = 0 */
+typealias integer { size = 0; align = 8; signed = false; } := uint0_t;    
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.9/fail/types02/metadata b/tests/1.9/fail/types02/metadata
new file mode 100644 (file)
index 0000000..64caaec
--- /dev/null
+++ b/tests/1.9/fail/types02/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: Alignment values must be power of two. */
+typealias integer { size = 8; align = 17; signed = false; } := uint0_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.9/fail/types03/metadata b/tests/1.9/fail/types03/metadata
new file mode 100644 (file)
index 0000000..66fdd53
--- /dev/null
+++ b/tests/1.9/fail/types03/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: invalid byte ordering. */
+typealias integer { size = 8; align = 8; signed = false; byte_order = iroquois; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.9/fail/types04/metadata b/tests/1.9/fail/types04/metadata
new file mode 100644 (file)
index 0000000..c3939db
--- /dev/null
+++ b/tests/1.9/fail/types04/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: invalid signed. */
+typealias integer { size = 8; align = 8; signed = svp; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.9/fail/types05/metadata b/tests/1.9/fail/types05/metadata
new file mode 100644 (file)
index 0000000..6d87f56
--- /dev/null
+++ b/tests/1.9/fail/types05/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: negative size. */
+typealias integer { size = -8; align = 8; signed = false; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.9/fail/types06/metadata b/tests/1.9/fail/types06/metadata
new file mode 100644 (file)
index 0000000..2d60c33
--- /dev/null
+++ b/tests/1.9/fail/types06/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: negative align. */
+typealias integer { size = 8; align = -8; signed = false; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.9/fail/types07/metadata b/tests/1.9/fail/types07/metadata
new file mode 100644 (file)
index 0000000..4b97a9c
--- /dev/null
+++ b/tests/1.9/fail/types07/metadata
@@ -0,0 +1,16 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+ 
+/* FAIL: size as string. */
+typealias integer { size = "8"; align = 8; signed = false; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.9/fail/types08/metadata b/tests/1.9/fail/types08/metadata
new file mode 100644 (file)
index 0000000..c2fd4af
--- /dev/null
+++ b/tests/1.9/fail/types08/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: align as string. */
+typealias integer { size = 8; align = "8"; signed = false; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.9/fail/types09/metadata b/tests/1.9/fail/types09/metadata
new file mode 100644 (file)
index 0000000..7f5f142
--- /dev/null
+++ b/tests/1.9/fail/types09/metadata
@@ -0,0 +1,16 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+ 
+/* FAIL: signed as string. */
+typealias integer { size = 8; align = 8; signed = "false"; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.9/fail/types10/metadata b/tests/1.9/fail/types10/metadata
new file mode 100644 (file)
index 0000000..86b6496
--- /dev/null
+++ b/tests/1.9/fail/types10/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: name is a keyword. */
+typealias integer { size = 8; align = 8; signed = "false"; } := trace;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.9/fail/types11/metadata b/tests/1.9/fail/types11/metadata
new file mode 100644 (file)
index 0000000..6ac5b82
--- /dev/null
+++ b/tests/1.9/fail/types11/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: missing size. */
+typealias integer { align = 8; signed = "false"; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.9/fail/types12/metadata b/tests/1.9/fail/types12/metadata
new file mode 100644 (file)
index 0000000..8057394
--- /dev/null
+++ b/tests/1.9/fail/types12/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+ 
+/* FAIL: invalid kind. */
+typealias entier { size = 8; align = 8; signed = false; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.9/fail/types13/metadata b/tests/1.9/fail/types13/metadata
new file mode 100644 (file)
index 0000000..d379426
--- /dev/null
+++ b/tests/1.9/fail/types13/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+ 
+/* FAIL: base as a string. */
+typealias integer { size = 8; align = 8; signed = false; base = "decimal"; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.9/fail/types14/metadata b/tests/1.9/fail/types14/metadata
new file mode 100644 (file)
index 0000000..051c230
--- /dev/null
+++ b/tests/1.9/fail/types14/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+ 
+/* FAIL: invalid base. */
+typealias integer { size = 8; align = 8; signed = false; base = orthogonal; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.9/fail/types15/metadata b/tests/1.9/fail/types15/metadata
new file mode 100644 (file)
index 0000000..6343188
--- /dev/null
+++ b/tests/1.9/fail/types15/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+ 
+/* FAIL: invalid encoding. */
+typealias integer { size = 8; align = 8; signed = false; encoding = true; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.9/fail/types16/metadata b/tests/1.9/fail/types16/metadata
new file mode 100644 (file)
index 0000000..4eeb883
--- /dev/null
+++ b/tests/1.9/fail/types16/metadata
@@ -0,0 +1,15 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+ 
+/* FAIL: encoding as a string. */
+typealias integer { size = 8; align = 8; signed = false; encoding = "ascii"; } := uint8_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};

diff --git a/tests/1.9/fail/types17/metadata b/tests/1.9/fail/types17/metadata
new file mode 100644 (file)
index 0000000..abeee11
--- /dev/null
+++ b/tests/1.9/fail/types17/metadata
@@ -0,0 +1,19 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+typealias integer { size = 8; align = 8; signed = false; } := uint8_t;
+
+/* FAIL: out of range */
+enum dummy : uint8_t {
+  x = 1024
+};
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.9/fail/types18/metadata b/tests/1.9/fail/types18/metadata
new file mode 100644 (file)
index 0000000..3477e20
--- /dev/null
+++ b/tests/1.9/fail/types18/metadata
@@ -0,0 +1,18 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: out of range */
+enum dummy : uint32_t {
+  x = -1
+};
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.9/fail/types19/metadata b/tests/1.9/fail/types19/metadata
new file mode 100644 (file)
index 0000000..6d88bad
--- /dev/null
+++ b/tests/1.9/fail/types19/metadata
@@ -0,0 +1,18 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: implicite type int, but undefined. */
+enum dummy {
+  x = 1024
+};
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.9/fail/types20/metadata b/tests/1.9/fail/types20/metadata
new file mode 100644 (file)
index 0000000..7f7405c
--- /dev/null
+++ b/tests/1.9/fail/types20/metadata
@@ -0,0 +1,19 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: type int, but undefined. */
+struct dummy {
+  int xxx;
+};
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.9/fail/types21/metadata b/tests/1.9/fail/types21/metadata
new file mode 100644 (file)
index 0000000..9933b4e
--- /dev/null
+++ b/tests/1.9/fail/types21/metadata
@@ -0,0 +1,20 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: duplicate name */
+struct dummy {
+  uint32_t xxx;
+  uint32_t xxx;
+};
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.9/fail/types22/metadata b/tests/1.9/fail/types22/metadata
new file mode 100644 (file)
index 0000000..eb05c32
--- /dev/null
+++ b/tests/1.9/fail/types22/metadata
@@ -0,0 +1,23 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: duplicate name. */
+struct a {
+  uint32_t xxx;
+};
+
+struct a {
+  uint32_t xxx;
+};
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.9/fail/types23/metadata b/tests/1.9/fail/types23/metadata
new file mode 100644 (file)
index 0000000..326f730
--- /dev/null
+++ b/tests/1.9/fail/types23/metadata
@@ -0,0 +1,17 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: duplicate name. */
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.9/fail/types24/metadata b/tests/1.9/fail/types24/metadata
new file mode 100644 (file)
index 0000000..666933a
--- /dev/null
+++ b/tests/1.9/fail/types24/metadata
@@ -0,0 +1,20 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: keyword as a field. */
+struct a {
+  uint32_t trace;
+};
+
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.9/fail/types25/metadata b/tests/1.9/fail/types25/metadata
new file mode 100644 (file)
index 0000000..5ca0fb5
--- /dev/null
+++ b/tests/1.9/fail/types25/metadata
@@ -0,0 +1,20 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: keyword as a field. */
+struct a {
+  uint32_t x;
+} align(-1);
+
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.9/fail/types26/metadata b/tests/1.9/fail/types26/metadata
new file mode 100644 (file)
index 0000000..3d1b760
--- /dev/null
+++ b/tests/1.9/fail/types26/metadata
@@ -0,0 +1,17 @@
+/* CTF 1.8 */
+
+typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
+
+/* FAIL: negative array. */
+typedef uint32_t name[-1];
+
+trace {
+       major = 2;
+       minor = 1;
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+       };
+};
+
+

diff --git a/tests/1.9/pass/env-warning/dummystream b/tests/1.9/pass/env-warning/dummystream
new file mode 100644 (file)
index 0000000..53d735e
Binary files /dev/null and b/tests/1.9/pass/env-warning/dummystream differ

diff --git a/tests/1.9/pass/env-warning/metadata b/tests/1.9/pass/env-warning/metadata
new file mode 100644 (file)
index 0000000..f3618e2
--- /dev/null
+++ b/tests/1.9/pass/env-warning/metadata
@@ -0,0 +1,30 @@
+/* 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;
+
+trace {
+       major = 0;
+       minor = 1;
+       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+               uint8_t  uuid[16];
+       };
+};
+
+env {
+       dummy = "blah";
+};
+
+stream {
+       packet.context := struct {
+               uint32_t content_size;
+               uint32_t packet_size;
+       };
+};
+
+event {
+       name = string;
+       fields := struct { string str; };
+};

diff --git a/tests/1.9/pass/list b/tests/1.9/pass/list
new file mode 100644 (file)
index 0000000..ef5388d
--- /dev/null
+++ b/tests/1.9/pass/list
@@ -0,0 +1,12 @@
+./test.sh env-warning/
+./test.sh lttng-modules-2.0-pre5/
+./test.sh smalltrace/
+./test.sh succeed1/
+./test.sh succeed2/
+./test.sh succeed4/
+./test.sh string-concat/
+./test.sh string-literal-escape/
+./test.sh test/
+./test.sh warnings/
+./test.sh wk-heartbeat-u/
+./test.sh minimal/

diff --git a/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_0 b/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_0
new file mode 100755 (executable)
index 0000000..528aa6c
Binary files /dev/null and b/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_0 differ

diff --git a/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_1 b/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_1
new file mode 100755 (executable)
index 0000000..41ac45a
Binary files /dev/null and b/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_1 differ

diff --git a/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_2 b/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_2
new file mode 100755 (executable)
index 0000000..b6fc7f7
Binary files /dev/null and b/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_2 differ

diff --git a/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_3 b/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_3
new file mode 100755 (executable)
index 0000000..b79f6cb
Binary files /dev/null and b/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_3 differ

diff --git a/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_4 b/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_4
new file mode 100755 (executable)
index 0000000..3ff7ea5
Binary files /dev/null and b/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_4 differ

diff --git a/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_5 b/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_5
new file mode 100755 (executable)
index 0000000..ed41169
Binary files /dev/null and b/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_5 differ

diff --git a/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_6 b/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_6
new file mode 100755 (executable)
index 0000000..89502f0
Binary files /dev/null and b/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_6 differ

diff --git a/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_7 b/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_7
new file mode 100755 (executable)
index 0000000..1199fac
Binary files /dev/null and b/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_7 differ

diff --git a/tests/1.9/pass/lttng-modules-2.0-pre5/metadata b/tests/1.9/pass/lttng-modules-2.0-pre5/metadata
new file mode 100755 (executable)
index 0000000..de5959a
Binary files /dev/null and b/tests/1.9/pass/lttng-modules-2.0-pre5/metadata differ

diff --git a/tests/1.9/pass/minimal/metadata b/tests/1.9/pass/minimal/metadata
new file mode 100644 (file)
index 0000000..7a459fa
--- /dev/null
+++ b/tests/1.9/pass/minimal/metadata
@@ -0,0 +1 @@
+/* CTF 1.8 */

diff --git a/tests/1.9/pass/run.sh b/tests/1.9/pass/run.sh
new file mode 100755 (executable)
index 0000000..d43ea19
--- /dev/null
+++ b/tests/1.9/pass/run.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+prove --exec '' --merge - < list

diff --git a/tests/1.9/pass/smalltrace/dummystream b/tests/1.9/pass/smalltrace/dummystream
new file mode 100644 (file)
index 0000000..469cb9a
Binary files /dev/null and b/tests/1.9/pass/smalltrace/dummystream differ

diff --git a/tests/1.9/pass/smalltrace/metadata b/tests/1.9/pass/smalltrace/metadata
new file mode 100644 (file)
index 0000000..86f8e0a
--- /dev/null
+++ b/tests/1.9/pass/smalltrace/metadata
@@ -0,0 +1,19 @@
+/* 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;
+
+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 { string str; };
+};

diff --git a/tests/1.9/pass/string-concat/metadata b/tests/1.9/pass/string-concat/metadata
new file mode 100644 (file)
index 0000000..d4440b8
--- /dev/null
+++ b/tests/1.9/pass/string-concat/metadata
@@ -0,0 +1,5 @@
+/* CTF 1.8 */
+
+trace {
+       test = "abc" "def";
+};

diff --git a/tests/1.9/pass/string-literal-escape/dummystream b/tests/1.9/pass/string-literal-escape/dummystream
new file mode 100644 (file)
index 0000000..53d735e
Binary files /dev/null and b/tests/1.9/pass/string-literal-escape/dummystream differ

diff --git a/tests/1.9/pass/string-literal-escape/metadata b/tests/1.9/pass/string-literal-escape/metadata
new file mode 100644 (file)
index 0000000..71d6c18
--- /dev/null
+++ b/tests/1.9/pass/string-literal-escape/metadata
@@ -0,0 +1,41 @@
+/* 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;
+
+trace {
+       major = 0;
+       minor = 1;
+       test2 = "?\x20\040\123\0?";
+       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
+       byte_order = le;
+       packet.header := struct {
+               uint32_t magic;
+               uint8_t  uuid[16];
+       };
+};
+
+/* use babeltrace -f trace:hostname to print. */
+
+/*
+ * Expected:
+
+abc " hex: A, #, #, #1,
+oct: A, #, #, #1,
+
+ */
+
+env {
+       hostname = "\nabc \" hex: \x41, \x23, \x023, \x0231,\noct: \101, \043, \43, \0431, \0NOT SEEN";
+};
+
+stream {
+       packet.context := struct {
+               uint32_t content_size;
+               uint32_t packet_size;
+       };
+};
+
+event {
+       name = string;
+       fields := struct { string str; };
+};

diff --git a/tests/1.9/pass/succeed1/dummystream b/tests/1.9/pass/succeed1/dummystream
new file mode 100644 (file)
index 0000000..53d735e
Binary files /dev/null and b/tests/1.9/pass/succeed1/dummystream differ

diff --git a/tests/1.9/pass/succeed1/metadata b/tests/1.9/pass/succeed1/metadata
new file mode 100644 (file)
index 0000000..f88ffb0
--- /dev/null
+++ b/tests/1.9/pass/succeed1/metadata
@@ -0,0 +1,26 @@
+/* CTF 1.8 */
+typealias integer { size = 8; align = 8; signed = false; } := uint8_t;
+typealias integer { size = 32; align = 32; signed = false; } := 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 content_size;
+               uint32_t packet_size;
+       };
+};
+
+event {
+       name = string;
+       fields := struct { string str; };
+};

diff --git a/tests/1.9/pass/succeed2/dummystream b/tests/1.9/pass/succeed2/dummystream
new file mode 100644 (file)
index 0000000..53d735e
Binary files /dev/null and b/tests/1.9/pass/succeed2/dummystream differ

diff --git a/tests/1.9/pass/succeed2/metadata b/tests/1.9/pass/succeed2/metadata
new file mode 100644 (file)
index 0000000..10a288f
--- /dev/null
+++ b/tests/1.9/pass/succeed2/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;
+
+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 content_size;
+               uint32_t packet_size;
+       };
+};
+
+event {
+       name = string;
+       fields := struct { string str; };
+};

diff --git a/tests/1.9/pass/succeed4/metadata b/tests/1.9/pass/succeed4/metadata
new file mode 100644 (file)
index 0000000..a3d401a
--- /dev/null
+++ b/tests/1.9/pass/succeed4/metadata
@@ -0,0 +1,31 @@
+/* CTF 1.8 */
+typealias integer { size = 8; align = 8; signed = false; } := uint8_t;
+typealias integer { size = 32; align = 32; signed = false; } := uint32_t;
+
+trace {
+       major = 0;
+       minor = 1;
+       test = 0xABC234;        /* hexadecimal */
+       test1 = 06534;          /* octal */
+       test2 = 1234;           /* decimal */
+       test3 = +1234;          /* decimal with + unary op */
+       test4 = -1234;          /* decimal (negated) */
+       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 content_size;
+               uint32_t packet_size;
+       };
+};
+
+event {
+       name = string;
+       fields := struct { string str; };
+};

diff --git a/tests/1.9/pass/test.sh b/tests/1.9/pass/test.sh
new file mode 100755 (executable)
index 0000000..e4506a3
--- /dev/null
+++ b/tests/1.9/pass/test.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+# Copyright (C) - 2013 Christian Babeux <christian.babeux@efficios.com>
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License, version 2 only, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+CURDIR=$(dirname $0)
+UTILS_DIR=$CURDIR/../../../utils/
+
+source $UTILS_DIR/tap/tap.sh
+
+NUM_TESTS=1
+
+plan_tests $NUM_TESTS
+
+$CTF_READER_BIN $CTF_READER_OPTS $1 >/dev/null 2>&1
+
+result=$?
+
+is $result 0 $1

diff --git a/tests/1.9/pass/test/channel0_0 b/tests/1.9/pass/test/channel0_0
new file mode 100755 (executable)
index 0000000..528aa6c
Binary files /dev/null and b/tests/1.9/pass/test/channel0_0 differ

diff --git a/tests/1.9/pass/test/channel0_1 b/tests/1.9/pass/test/channel0_1
new file mode 100755 (executable)
index 0000000..41ac45a
Binary files /dev/null and b/tests/1.9/pass/test/channel0_1 differ

diff --git a/tests/1.9/pass/test/channel0_2 b/tests/1.9/pass/test/channel0_2
new file mode 100755 (executable)
index 0000000..b6fc7f7
Binary files /dev/null and b/tests/1.9/pass/test/channel0_2 differ

diff --git a/tests/1.9/pass/test/channel0_3 b/tests/1.9/pass/test/channel0_3
new file mode 100755 (executable)
index 0000000..b79f6cb
Binary files /dev/null and b/tests/1.9/pass/test/channel0_3 differ

diff --git a/tests/1.9/pass/test/channel0_4 b/tests/1.9/pass/test/channel0_4
new file mode 100755 (executable)
index 0000000..3ff7ea5
Binary files /dev/null and b/tests/1.9/pass/test/channel0_4 differ

diff --git a/tests/1.9/pass/test/channel0_5 b/tests/1.9/pass/test/channel0_5
new file mode 100755 (executable)
index 0000000..ed41169
Binary files /dev/null and b/tests/1.9/pass/test/channel0_5 differ

diff --git a/tests/1.9/pass/test/channel0_6 b/tests/1.9/pass/test/channel0_6
new file mode 100755 (executable)
index 0000000..89502f0
Binary files /dev/null and b/tests/1.9/pass/test/channel0_6 differ

diff --git a/tests/1.9/pass/test/channel0_7 b/tests/1.9/pass/test/channel0_7
new file mode 100755 (executable)
index 0000000..1199fac
Binary files /dev/null and b/tests/1.9/pass/test/channel0_7 differ

diff --git a/tests/1.9/pass/test/metadata b/tests/1.9/pass/test/metadata
new file mode 100755 (executable)
index 0000000..de5959a
Binary files /dev/null and b/tests/1.9/pass/test/metadata differ

diff --git a/tests/1.9/pass/warnings/dummystream b/tests/1.9/pass/warnings/dummystream
new file mode 100644 (file)
index 0000000..53d735e
Binary files /dev/null and b/tests/1.9/pass/warnings/dummystream differ

diff --git a/tests/1.9/pass/warnings/metadata b/tests/1.9/pass/warnings/metadata
new file mode 100644 (file)
index 0000000..30ca784
--- /dev/null
+++ b/tests/1.9/pass/warnings/metadata
@@ -0,0 +1,29 @@
+/* CTF 1.8 */
+typealias integer { size = 8; align = 8; signed = false; aa = bb; } := uint8_t;
+typealias integer { size = 32; align = 32; signed = false; zz = aa; } := 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];
+       };
+       blah = "aaa";
+};
+
+stream {
+       packet.context := struct {
+               uint32_t content_size;
+               uint32_t packet_size;
+       };
+       askdjfhaskdjfh = 1;
+};
+
+event {
+       name = string;
+       fields := struct { string str; };
+       asdjfhah := struct { uint8_t ffff; };
+};

diff --git a/tests/1.9/pass/wk-heartbeat-u/metadata b/tests/1.9/pass/wk-heartbeat-u/metadata
new file mode 100755 (executable)
index 0000000..e35f463
Binary files /dev/null and b/tests/1.9/pass/wk-heartbeat-u/metadata differ

diff --git a/tests/1.9/pass/wk-heartbeat-u/u_0 b/tests/1.9/pass/wk-heartbeat-u/u_0
new file mode 100755 (executable)
index 0000000..3af2cdc
Binary files /dev/null and b/tests/1.9/pass/wk-heartbeat-u/u_0 differ

diff --git a/tests/1.9/pass/wk-heartbeat-u/u_1 b/tests/1.9/pass/wk-heartbeat-u/u_1
new file mode 100755 (executable)
index 0000000..7b74c03
Binary files /dev/null and b/tests/1.9/pass/wk-heartbeat-u/u_1 differ

diff --git a/tests/1.9/pass/wk-heartbeat-u/u_2 b/tests/1.9/pass/wk-heartbeat-u/u_2
new file mode 100755 (executable)
index 0000000..13a69fc
Binary files /dev/null and b/tests/1.9/pass/wk-heartbeat-u/u_2 differ

diff --git a/tests/1.9/pass/wk-heartbeat-u/u_3 b/tests/1.9/pass/wk-heartbeat-u/u_3
new file mode 100755 (executable)
index 0000000..1cdde72
Binary files /dev/null and b/tests/1.9/pass/wk-heartbeat-u/u_3 differ

diff --git a/tests/1.9/pass/wk-heartbeat-u/u_4 b/tests/1.9/pass/wk-heartbeat-u/u_4
new file mode 100755 (executable)
index 0000000..c136034
Binary files /dev/null and b/tests/1.9/pass/wk-heartbeat-u/u_4 differ

diff --git a/tests/1.9/pass/wk-heartbeat-u/u_5 b/tests/1.9/pass/wk-heartbeat-u/u_5
new file mode 100755 (executable)
index 0000000..a0a5881
Binary files /dev/null and b/tests/1.9/pass/wk-heartbeat-u/u_5 differ

diff --git a/tests/1.9/pass/wk-heartbeat-u/u_6 b/tests/1.9/pass/wk-heartbeat-u/u_6
new file mode 100755 (executable)
index 0000000..b1c8520
Binary files /dev/null and b/tests/1.9/pass/wk-heartbeat-u/u_6 differ

diff --git a/tests/1.9/pass/wk-heartbeat-u/u_7 b/tests/1.9/pass/wk-heartbeat-u/u_7
new file mode 100755 (executable)
index 0000000..05f7393
Binary files /dev/null and b/tests/1.9/pass/wk-heartbeat-u/u_7 differ

diff --git a/tests/1.9/run.sh b/tests/1.9/run.sh
new file mode 100755 (executable)
index 0000000..8556098
--- /dev/null
+++ b/tests/1.9/run.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+#pass/run.sh
+
+cd fail/
+./run.sh

diff --git a/tests/fail/empty/metadata b/tests/fail/empty/metadata
deleted file mode 100644 (file)
index 7a459fa..0000000
--- a/tests/fail/empty/metadata
+++ /dev/null
@@ -1 +0,0 @@
-/* CTF 1.8 */

diff --git a/tests/fail/fail1/dummystream b/tests/fail/fail1/dummystream
deleted file mode 100644 (file)
index 2601067..0000000
Binary files a/tests/fail/fail1/dummystream and /dev/null differ

diff --git a/tests/fail/fail1/metadata b/tests/fail/fail1/metadata
deleted file mode 100644 (file)
index 28185f5..0000000
--- a/tests/fail/fail1/metadata
+++ /dev/null
@@ -1,49 +0,0 @@
-/* CTF 1.8
- *
- * Architecture with 32-bit pointers, 32-bit integers, 32-bit longs.
- */
-
-typealias integer { size = 1; align = 1; signed = false; } := uint1_t;
-typealias integer { size = 8; align = 8; signed = false; } := uint8_t;
-typealias integer { size = 63; align = 1; signed = false; } := timestamp_t;
-
-typealias integer { size = 32; align = 32; signed = false; base = 10; } := uint32_t;
-typealias integer { size = 32; align = 32; signed = false; } := void *;
-
-
-trace {
-       major = 0;
-       minor = 1;
-       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-               uint8_t  uuid[16];
-               uint32_t stream_id;
-       };
-};
-
-stream {
-       event.header := struct {
-               uint1_t id;
-               timestamp_t timestamp;
-       };
-       event.context := struct {
-               uint32_t thread_id;
-               uint32_t event_count;
-       };                      
-};
-
-event {
-       name = func_enter;
-       id = 0;
-       fields := struct {
-               void *func_called;
-               void *called_from;
-       };
-};
-
-event {
-       name = func_exit;
-       id = 1;
-};

diff --git a/tests/fail/fail2/metadata b/tests/fail/fail2/metadata
deleted file mode 100644 (file)
index 456661e..0000000
Binary files a/tests/fail/fail2/metadata and /dev/null differ

diff --git a/tests/fail/integer-range/metadata b/tests/fail/integer-range/metadata
deleted file mode 100644 (file)
index 3574940..0000000
--- a/tests/fail/integer-range/metadata
+++ /dev/null
@@ -1,27 +0,0 @@
-/* CTF 1.8 */
-typealias integer { size = 8; align = 8; signed = false; } := uint8_t;
-typealias integer { size = 32; align = 32; signed = false; } := uint32_t;
-
-trace {
-       /* Integer out of range */
-       major = 23452397856348975623897562893746589237465289374658923764598237645897234658723648579236;
-       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 content_size;
-               uint32_t packet_size;
-       };
-};
-
-event {
-       name = string;
-       fields := struct { string str; };
-};

diff --git a/tests/fail/list b/tests/fail/list
deleted file mode 100644 (file)
index 7188ec7..0000000
--- a/tests/fail/list
+++ /dev/null
@@ -1,33 +0,0 @@
-./test.sh empty/
-./test.sh types01/
-./test.sh types02/
-./test.sh types03/
-./test.sh types04/
-./test.sh types05/
-./test.sh types06/
-./test.sh types07/
-./test.sh types08/
-./test.sh types09/
-./test.sh types10/
-./test.sh types11/
-./test.sh types12/
-./test.sh types13/
-./test.sh types14/
-./test.sh types15/
-./test.sh types16/
-./test.sh types17/
-./test.sh types18/
-./test.sh types19/
-./test.sh types20/
-./test.sh types21/
-./test.sh types22/
-./test.sh types23/
-./test.sh types24/
-./test.sh types25/
-./test.sh types26/
-./test.sh fail1/
-./test.sh fail2/
-./test.sh integer-range/
-./test.sh lttng-modules-2.0-pre1/
-./test.sh packet-based-metadata/
-./test.sh smalltrace/

diff --git a/tests/fail/lttng-modules-2.0-pre1/metadata b/tests/fail/lttng-modules-2.0-pre1/metadata
deleted file mode 100755 (executable)
index 6f92a29..0000000
Binary files a/tests/fail/lttng-modules-2.0-pre1/metadata and /dev/null differ

diff --git a/tests/fail/packet-based-metadata/metadata b/tests/fail/packet-based-metadata/metadata
deleted file mode 100644 (file)
index e209780..0000000
Binary files a/tests/fail/packet-based-metadata/metadata and /dev/null differ

diff --git a/tests/fail/run.sh b/tests/fail/run.sh
deleted file mode 100755 (executable)
index d43ea19..0000000
--- a/tests/fail/run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-prove --exec '' --merge - < list

diff --git a/tests/fail/smalltrace/dummystream-fail b/tests/fail/smalltrace/dummystream-fail
deleted file mode 100644 (file)
index fc7e07c..0000000
--- a/tests/fail/smalltrace/dummystream-fail
+++ /dev/null
@@ -1 +0,0 @@
-Á\1füÁ*d
\ No newline at end of file

diff --git a/tests/fail/smalltrace/metadata b/tests/fail/smalltrace/metadata
deleted file mode 100644 (file)
index 86f8e0a..0000000
--- a/tests/fail/smalltrace/metadata
+++ /dev/null
@@ -1,19 +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;
-
-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 { string str; };
-};

diff --git a/tests/fail/test.sh b/tests/fail/test.sh
deleted file mode 100755 (executable)
index d3a61e0..0000000
--- a/tests/fail/test.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) - 2013 Christian Babeux <christian.babeux@efficios.com>
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License, version 2 only, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-CURDIR=$(dirname $0)
-UTILS_DIR=$CURDIR/../../utils/
-
-source $UTILS_DIR/tap/tap.sh
-
-NUM_TESTS=1
-
-plan_tests $NUM_TESTS
-
-$CTF_READER_BIN $CTF_READER_OPTS $1 >/dev/null 2>&1
-
-result=$?
-
-is $result 1 $1

diff --git a/tests/fail/types01/metadata b/tests/fail/types01/metadata
deleted file mode 100644 (file)
index f734c50..0000000
--- a/tests/fail/types01/metadata
+++ /dev/null
@@ -1,15 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-/* FAIL: size = 0 */
-typealias integer { size = 0; align = 8; signed = false; } := uint0_t;    
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};

diff --git a/tests/fail/types02/metadata b/tests/fail/types02/metadata
deleted file mode 100644 (file)
index 64caaec..0000000
--- a/tests/fail/types02/metadata
+++ /dev/null
@@ -1,15 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-/* FAIL: Alignment values must be power of two. */
-typealias integer { size = 8; align = 17; signed = false; } := uint0_t;
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};

diff --git a/tests/fail/types03/metadata b/tests/fail/types03/metadata
deleted file mode 100644 (file)
index 66fdd53..0000000
--- a/tests/fail/types03/metadata
+++ /dev/null
@@ -1,15 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-/* FAIL: invalid byte ordering. */
-typealias integer { size = 8; align = 8; signed = false; byte_order = iroquois; } := uint8_t;
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};

diff --git a/tests/fail/types04/metadata b/tests/fail/types04/metadata
deleted file mode 100644 (file)
index c3939db..0000000
--- a/tests/fail/types04/metadata
+++ /dev/null
@@ -1,15 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-/* FAIL: invalid signed. */
-typealias integer { size = 8; align = 8; signed = svp; } := uint8_t;
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};

diff --git a/tests/fail/types05/metadata b/tests/fail/types05/metadata
deleted file mode 100644 (file)
index 6d87f56..0000000
--- a/tests/fail/types05/metadata
+++ /dev/null
@@ -1,15 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-/* FAIL: negative size. */
-typealias integer { size = -8; align = 8; signed = false; } := uint8_t;
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};

diff --git a/tests/fail/types06/metadata b/tests/fail/types06/metadata
deleted file mode 100644 (file)
index 2d60c33..0000000
--- a/tests/fail/types06/metadata
+++ /dev/null
@@ -1,15 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-/* FAIL: negative align. */
-typealias integer { size = 8; align = -8; signed = false; } := uint8_t;
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};

diff --git a/tests/fail/types07/metadata b/tests/fail/types07/metadata
deleted file mode 100644 (file)
index 4b97a9c..0000000
--- a/tests/fail/types07/metadata
+++ /dev/null
@@ -1,16 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
- 
-/* FAIL: size as string. */
-typealias integer { size = "8"; align = 8; signed = false; } := uint8_t;
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};

diff --git a/tests/fail/types08/metadata b/tests/fail/types08/metadata
deleted file mode 100644 (file)
index c2fd4af..0000000
--- a/tests/fail/types08/metadata
+++ /dev/null
@@ -1,15 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-/* FAIL: align as string. */
-typealias integer { size = 8; align = "8"; signed = false; } := uint8_t;
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};

diff --git a/tests/fail/types09/metadata b/tests/fail/types09/metadata
deleted file mode 100644 (file)
index 7f5f142..0000000
--- a/tests/fail/types09/metadata
+++ /dev/null
@@ -1,16 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
- 
-/* FAIL: signed as string. */
-typealias integer { size = 8; align = 8; signed = "false"; } := uint8_t;
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};

diff --git a/tests/fail/types10/metadata b/tests/fail/types10/metadata
deleted file mode 100644 (file)
index 86b6496..0000000
--- a/tests/fail/types10/metadata
+++ /dev/null
@@ -1,15 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-/* FAIL: name is a keyword. */
-typealias integer { size = 8; align = 8; signed = "false"; } := trace;
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};

diff --git a/tests/fail/types11/metadata b/tests/fail/types11/metadata
deleted file mode 100644 (file)
index 6ac5b82..0000000
--- a/tests/fail/types11/metadata
+++ /dev/null
@@ -1,15 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-/* FAIL: missing size. */
-typealias integer { align = 8; signed = "false"; } := uint8_t;
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};

diff --git a/tests/fail/types12/metadata b/tests/fail/types12/metadata
deleted file mode 100644 (file)
index 8057394..0000000
--- a/tests/fail/types12/metadata
+++ /dev/null
@@ -1,15 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
- 
-/* FAIL: invalid kind. */
-typealias entier { size = 8; align = 8; signed = false; } := uint8_t;
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};

diff --git a/tests/fail/types13/metadata b/tests/fail/types13/metadata
deleted file mode 100644 (file)
index d379426..0000000
--- a/tests/fail/types13/metadata
+++ /dev/null
@@ -1,15 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
- 
-/* FAIL: base as a string. */
-typealias integer { size = 8; align = 8; signed = false; base = "decimal"; } := uint8_t;
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};

diff --git a/tests/fail/types14/metadata b/tests/fail/types14/metadata
deleted file mode 100644 (file)
index 051c230..0000000
--- a/tests/fail/types14/metadata
+++ /dev/null
@@ -1,15 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
- 
-/* FAIL: invalid base. */
-typealias integer { size = 8; align = 8; signed = false; base = orthogonal; } := uint8_t;
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};

diff --git a/tests/fail/types15/metadata b/tests/fail/types15/metadata
deleted file mode 100644 (file)
index 6343188..0000000
--- a/tests/fail/types15/metadata
+++ /dev/null
@@ -1,15 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
- 
-/* FAIL: invalid encoding. */
-typealias integer { size = 8; align = 8; signed = false; encoding = true; } := uint8_t;
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};

diff --git a/tests/fail/types16/metadata b/tests/fail/types16/metadata
deleted file mode 100644 (file)
index 4eeb883..0000000
--- a/tests/fail/types16/metadata
+++ /dev/null
@@ -1,15 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
- 
-/* FAIL: encoding as a string. */
-typealias integer { size = 8; align = 8; signed = false; encoding = "ascii"; } := uint8_t;
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};

diff --git a/tests/fail/types17/metadata b/tests/fail/types17/metadata
deleted file mode 100644 (file)
index abeee11..0000000
--- a/tests/fail/types17/metadata
+++ /dev/null
@@ -1,19 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-typealias integer { size = 8; align = 8; signed = false; } := uint8_t;
-
-/* FAIL: out of range */
-enum dummy : uint8_t {
-  x = 1024
-};
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};
-
-

diff --git a/tests/fail/types18/metadata b/tests/fail/types18/metadata
deleted file mode 100644 (file)
index 3477e20..0000000
--- a/tests/fail/types18/metadata
+++ /dev/null
@@ -1,18 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-/* FAIL: out of range */
-enum dummy : uint32_t {
-  x = -1
-};
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};
-
-

diff --git a/tests/fail/types19/metadata b/tests/fail/types19/metadata
deleted file mode 100644 (file)
index 6d88bad..0000000
--- a/tests/fail/types19/metadata
+++ /dev/null
@@ -1,18 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-/* FAIL: implicite type int, but undefined. */
-enum dummy {
-  x = 1024
-};
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};
-
-

diff --git a/tests/fail/types20/metadata b/tests/fail/types20/metadata
deleted file mode 100644 (file)
index 7f7405c..0000000
--- a/tests/fail/types20/metadata
+++ /dev/null
@@ -1,19 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-/* FAIL: type int, but undefined. */
-struct dummy {
-  int xxx;
-};
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};
-
-

diff --git a/tests/fail/types21/metadata b/tests/fail/types21/metadata
deleted file mode 100644 (file)
index 9933b4e..0000000
--- a/tests/fail/types21/metadata
+++ /dev/null
@@ -1,20 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-/* FAIL: duplicate name */
-struct dummy {
-  uint32_t xxx;
-  uint32_t xxx;
-};
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};
-
-

diff --git a/tests/fail/types22/metadata b/tests/fail/types22/metadata
deleted file mode 100644 (file)
index eb05c32..0000000
--- a/tests/fail/types22/metadata
+++ /dev/null
@@ -1,23 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-/* FAIL: duplicate name. */
-struct a {
-  uint32_t xxx;
-};
-
-struct a {
-  uint32_t xxx;
-};
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};
-
-

diff --git a/tests/fail/types23/metadata b/tests/fail/types23/metadata
deleted file mode 100644 (file)
index 326f730..0000000
--- a/tests/fail/types23/metadata
+++ /dev/null
@@ -1,17 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-/* FAIL: duplicate name. */
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};
-
-

diff --git a/tests/fail/types24/metadata b/tests/fail/types24/metadata
deleted file mode 100644 (file)
index 666933a..0000000
--- a/tests/fail/types24/metadata
+++ /dev/null
@@ -1,20 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-/* FAIL: keyword as a field. */
-struct a {
-  uint32_t trace;
-};
-
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};
-
-

diff --git a/tests/fail/types25/metadata b/tests/fail/types25/metadata
deleted file mode 100644 (file)
index 5ca0fb5..0000000
--- a/tests/fail/types25/metadata
+++ /dev/null
@@ -1,20 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-/* FAIL: keyword as a field. */
-struct a {
-  uint32_t x;
-} align(-1);
-
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};
-
-

diff --git a/tests/fail/types26/metadata b/tests/fail/types26/metadata
deleted file mode 100644 (file)
index 3d1b760..0000000
--- a/tests/fail/types26/metadata
+++ /dev/null
@@ -1,17 +0,0 @@
-/* CTF 1.8 */
-
-typealias integer { size = 32; align = 8; signed = false; } := uint32_t;
-
-/* FAIL: negative array. */
-typedef uint32_t name[-1];
-
-trace {
-       major = 2;
-       minor = 1;
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-       };
-};
-
-

diff --git a/tests/pass/env-warning/dummystream b/tests/pass/env-warning/dummystream
deleted file mode 100644 (file)
index 53d735e..0000000
Binary files a/tests/pass/env-warning/dummystream and /dev/null differ

diff --git a/tests/pass/env-warning/metadata b/tests/pass/env-warning/metadata
deleted file mode 100644 (file)
index f3618e2..0000000
--- a/tests/pass/env-warning/metadata
+++ /dev/null
@@ -1,30 +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;
-
-trace {
-       major = 0;
-       minor = 1;
-       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-               uint8_t  uuid[16];
-       };
-};
-
-env {
-       dummy = "blah";
-};
-
-stream {
-       packet.context := struct {
-               uint32_t content_size;
-               uint32_t packet_size;
-       };
-};
-
-event {
-       name = string;
-       fields := struct { string str; };
-};

diff --git a/tests/pass/list b/tests/pass/list
deleted file mode 100644 (file)
index ef5388d..0000000
--- a/tests/pass/list
+++ /dev/null
@@ -1,12 +0,0 @@
-./test.sh env-warning/
-./test.sh lttng-modules-2.0-pre5/
-./test.sh smalltrace/
-./test.sh succeed1/
-./test.sh succeed2/
-./test.sh succeed4/
-./test.sh string-concat/
-./test.sh string-literal-escape/
-./test.sh test/
-./test.sh warnings/
-./test.sh wk-heartbeat-u/
-./test.sh minimal/

diff --git a/tests/pass/lttng-modules-2.0-pre5/channel0_0 b/tests/pass/lttng-modules-2.0-pre5/channel0_0
deleted file mode 100755 (executable)
index 528aa6c..0000000
Binary files a/tests/pass/lttng-modules-2.0-pre5/channel0_0 and /dev/null differ

diff --git a/tests/pass/lttng-modules-2.0-pre5/channel0_1 b/tests/pass/lttng-modules-2.0-pre5/channel0_1
deleted file mode 100755 (executable)
index 41ac45a..0000000
Binary files a/tests/pass/lttng-modules-2.0-pre5/channel0_1 and /dev/null differ

diff --git a/tests/pass/lttng-modules-2.0-pre5/channel0_2 b/tests/pass/lttng-modules-2.0-pre5/channel0_2
deleted file mode 100755 (executable)
index b6fc7f7..0000000
Binary files a/tests/pass/lttng-modules-2.0-pre5/channel0_2 and /dev/null differ

diff --git a/tests/pass/lttng-modules-2.0-pre5/channel0_3 b/tests/pass/lttng-modules-2.0-pre5/channel0_3
deleted file mode 100755 (executable)
index b79f6cb..0000000
Binary files a/tests/pass/lttng-modules-2.0-pre5/channel0_3 and /dev/null differ

diff --git a/tests/pass/lttng-modules-2.0-pre5/channel0_4 b/tests/pass/lttng-modules-2.0-pre5/channel0_4
deleted file mode 100755 (executable)
index 3ff7ea5..0000000
Binary files a/tests/pass/lttng-modules-2.0-pre5/channel0_4 and /dev/null differ

diff --git a/tests/pass/lttng-modules-2.0-pre5/channel0_5 b/tests/pass/lttng-modules-2.0-pre5/channel0_5
deleted file mode 100755 (executable)
index ed41169..0000000
Binary files a/tests/pass/lttng-modules-2.0-pre5/channel0_5 and /dev/null differ

diff --git a/tests/pass/lttng-modules-2.0-pre5/channel0_6 b/tests/pass/lttng-modules-2.0-pre5/channel0_6
deleted file mode 100755 (executable)
index 89502f0..0000000
Binary files a/tests/pass/lttng-modules-2.0-pre5/channel0_6 and /dev/null differ

diff --git a/tests/pass/lttng-modules-2.0-pre5/channel0_7 b/tests/pass/lttng-modules-2.0-pre5/channel0_7
deleted file mode 100755 (executable)
index 1199fac..0000000
Binary files a/tests/pass/lttng-modules-2.0-pre5/channel0_7 and /dev/null differ

diff --git a/tests/pass/lttng-modules-2.0-pre5/metadata b/tests/pass/lttng-modules-2.0-pre5/metadata
deleted file mode 100755 (executable)
index de5959a..0000000
Binary files a/tests/pass/lttng-modules-2.0-pre5/metadata and /dev/null differ

diff --git a/tests/pass/minimal/metadata b/tests/pass/minimal/metadata
deleted file mode 100644 (file)
index 7a459fa..0000000
--- a/tests/pass/minimal/metadata
+++ /dev/null
@@ -1 +0,0 @@
-/* CTF 1.8 */

diff --git a/tests/pass/run.sh b/tests/pass/run.sh
deleted file mode 100755 (executable)
index d43ea19..0000000
--- a/tests/pass/run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-prove --exec '' --merge - < list

diff --git a/tests/pass/smalltrace/dummystream b/tests/pass/smalltrace/dummystream
deleted file mode 100644 (file)
index 469cb9a..0000000
Binary files a/tests/pass/smalltrace/dummystream and /dev/null differ

diff --git a/tests/pass/smalltrace/metadata b/tests/pass/smalltrace/metadata
deleted file mode 100644 (file)
index 86f8e0a..0000000
--- a/tests/pass/smalltrace/metadata
+++ /dev/null
@@ -1,19 +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;
-
-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 { string str; };
-};

diff --git a/tests/pass/string-concat/metadata b/tests/pass/string-concat/metadata
deleted file mode 100644 (file)
index d4440b8..0000000
--- a/tests/pass/string-concat/metadata
+++ /dev/null
@@ -1,5 +0,0 @@
-/* CTF 1.8 */
-
-trace {
-       test = "abc" "def";
-};

diff --git a/tests/pass/string-literal-escape/dummystream b/tests/pass/string-literal-escape/dummystream
deleted file mode 100644 (file)
index 53d735e..0000000
Binary files a/tests/pass/string-literal-escape/dummystream and /dev/null differ

diff --git a/tests/pass/string-literal-escape/metadata b/tests/pass/string-literal-escape/metadata
deleted file mode 100644 (file)
index 71d6c18..0000000
--- a/tests/pass/string-literal-escape/metadata
+++ /dev/null
@@ -1,41 +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;
-
-trace {
-       major = 0;
-       minor = 1;
-       test2 = "?\x20\040\123\0?";
-       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-               uint8_t  uuid[16];
-       };
-};
-
-/* use babeltrace -f trace:hostname to print. */
-
-/*
- * Expected:
-
-abc " hex: A, #, #, #1,
-oct: A, #, #, #1,
-
- */
-
-env {
-       hostname = "\nabc \" hex: \x41, \x23, \x023, \x0231,\noct: \101, \043, \43, \0431, \0NOT SEEN";
-};
-
-stream {
-       packet.context := struct {
-               uint32_t content_size;
-               uint32_t packet_size;
-       };
-};
-
-event {
-       name = string;
-       fields := struct { string str; };
-};

diff --git a/tests/pass/succeed1/dummystream b/tests/pass/succeed1/dummystream
deleted file mode 100644 (file)
index 53d735e..0000000
Binary files a/tests/pass/succeed1/dummystream and /dev/null differ

diff --git a/tests/pass/succeed1/metadata b/tests/pass/succeed1/metadata
deleted file mode 100644 (file)
index f88ffb0..0000000
--- a/tests/pass/succeed1/metadata
+++ /dev/null
@@ -1,26 +0,0 @@
-/* CTF 1.8 */
-typealias integer { size = 8; align = 8; signed = false; } := uint8_t;
-typealias integer { size = 32; align = 32; signed = false; } := 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 content_size;
-               uint32_t packet_size;
-       };
-};
-
-event {
-       name = string;
-       fields := struct { string str; };
-};

diff --git a/tests/pass/succeed2/dummystream b/tests/pass/succeed2/dummystream
deleted file mode 100644 (file)
index 53d735e..0000000
Binary files a/tests/pass/succeed2/dummystream and /dev/null differ

diff --git a/tests/pass/succeed2/metadata b/tests/pass/succeed2/metadata
deleted file mode 100644 (file)
index 10a288f..0000000
--- a/tests/pass/succeed2/metadata
+++ /dev/null
@@ -1,26 +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;
-
-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 content_size;
-               uint32_t packet_size;
-       };
-};
-
-event {
-       name = string;
-       fields := struct { string str; };
-};

diff --git a/tests/pass/succeed4/metadata b/tests/pass/succeed4/metadata
deleted file mode 100644 (file)
index a3d401a..0000000
--- a/tests/pass/succeed4/metadata
+++ /dev/null
@@ -1,31 +0,0 @@
-/* CTF 1.8 */
-typealias integer { size = 8; align = 8; signed = false; } := uint8_t;
-typealias integer { size = 32; align = 32; signed = false; } := uint32_t;
-
-trace {
-       major = 0;
-       minor = 1;
-       test = 0xABC234;        /* hexadecimal */
-       test1 = 06534;          /* octal */
-       test2 = 1234;           /* decimal */
-       test3 = +1234;          /* decimal with + unary op */
-       test4 = -1234;          /* decimal (negated) */
-       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 content_size;
-               uint32_t packet_size;
-       };
-};
-
-event {
-       name = string;
-       fields := struct { string str; };
-};

diff --git a/tests/pass/test.sh b/tests/pass/test.sh
deleted file mode 100755 (executable)
index 2c31f56..0000000
--- a/tests/pass/test.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) - 2013 Christian Babeux <christian.babeux@efficios.com>
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License, version 2 only, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-CURDIR=$(dirname $0)
-UTILS_DIR=$CURDIR/../../utils/
-
-source $UTILS_DIR/tap/tap.sh
-
-NUM_TESTS=1
-
-plan_tests $NUM_TESTS
-
-$CTF_READER_BIN $CTF_READER_OPTS $1 >/dev/null 2>&1
-
-result=$?
-
-is $result 0 $1

diff --git a/tests/pass/test/channel0_0 b/tests/pass/test/channel0_0
deleted file mode 100755 (executable)
index 528aa6c..0000000
Binary files a/tests/pass/test/channel0_0 and /dev/null differ

diff --git a/tests/pass/test/channel0_1 b/tests/pass/test/channel0_1
deleted file mode 100755 (executable)
index 41ac45a..0000000
Binary files a/tests/pass/test/channel0_1 and /dev/null differ

diff --git a/tests/pass/test/channel0_2 b/tests/pass/test/channel0_2
deleted file mode 100755 (executable)
index b6fc7f7..0000000
Binary files a/tests/pass/test/channel0_2 and /dev/null differ

diff --git a/tests/pass/test/channel0_3 b/tests/pass/test/channel0_3
deleted file mode 100755 (executable)
index b79f6cb..0000000
Binary files a/tests/pass/test/channel0_3 and /dev/null differ

diff --git a/tests/pass/test/channel0_4 b/tests/pass/test/channel0_4
deleted file mode 100755 (executable)
index 3ff7ea5..0000000
Binary files a/tests/pass/test/channel0_4 and /dev/null differ

diff --git a/tests/pass/test/channel0_5 b/tests/pass/test/channel0_5
deleted file mode 100755 (executable)
index ed41169..0000000
Binary files a/tests/pass/test/channel0_5 and /dev/null differ

diff --git a/tests/pass/test/channel0_6 b/tests/pass/test/channel0_6
deleted file mode 100755 (executable)
index 89502f0..0000000
Binary files a/tests/pass/test/channel0_6 and /dev/null differ

diff --git a/tests/pass/test/channel0_7 b/tests/pass/test/channel0_7
deleted file mode 100755 (executable)
index 1199fac..0000000
Binary files a/tests/pass/test/channel0_7 and /dev/null differ

diff --git a/tests/pass/test/metadata b/tests/pass/test/metadata
deleted file mode 100755 (executable)
index de5959a..0000000
Binary files a/tests/pass/test/metadata and /dev/null differ

diff --git a/tests/pass/warnings/dummystream b/tests/pass/warnings/dummystream
deleted file mode 100644 (file)
index 53d735e..0000000
Binary files a/tests/pass/warnings/dummystream and /dev/null differ

diff --git a/tests/pass/warnings/metadata b/tests/pass/warnings/metadata
deleted file mode 100644 (file)
index 30ca784..0000000
--- a/tests/pass/warnings/metadata
+++ /dev/null
@@ -1,29 +0,0 @@
-/* CTF 1.8 */
-typealias integer { size = 8; align = 8; signed = false; aa = bb; } := uint8_t;
-typealias integer { size = 32; align = 32; signed = false; zz = aa; } := 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];
-       };
-       blah = "aaa";
-};
-
-stream {
-       packet.context := struct {
-               uint32_t content_size;
-               uint32_t packet_size;
-       };
-       askdjfhaskdjfh = 1;
-};
-
-event {
-       name = string;
-       fields := struct { string str; };
-       asdjfhah := struct { uint8_t ffff; };
-};

diff --git a/tests/pass/wk-heartbeat-u/metadata b/tests/pass/wk-heartbeat-u/metadata
deleted file mode 100755 (executable)
index e35f463..0000000
Binary files a/tests/pass/wk-heartbeat-u/metadata and /dev/null differ

diff --git a/tests/pass/wk-heartbeat-u/u_0 b/tests/pass/wk-heartbeat-u/u_0
deleted file mode 100755 (executable)
index 3af2cdc..0000000
Binary files a/tests/pass/wk-heartbeat-u/u_0 and /dev/null differ

diff --git a/tests/pass/wk-heartbeat-u/u_1 b/tests/pass/wk-heartbeat-u/u_1
deleted file mode 100755 (executable)
index 7b74c03..0000000
Binary files a/tests/pass/wk-heartbeat-u/u_1 and /dev/null differ

diff --git a/tests/pass/wk-heartbeat-u/u_2 b/tests/pass/wk-heartbeat-u/u_2
deleted file mode 100755 (executable)
index 13a69fc..0000000
Binary files a/tests/pass/wk-heartbeat-u/u_2 and /dev/null differ

diff --git a/tests/pass/wk-heartbeat-u/u_3 b/tests/pass/wk-heartbeat-u/u_3
deleted file mode 100755 (executable)
index 1cdde72..0000000
Binary files a/tests/pass/wk-heartbeat-u/u_3 and /dev/null differ

diff --git a/tests/pass/wk-heartbeat-u/u_4 b/tests/pass/wk-heartbeat-u/u_4
deleted file mode 100755 (executable)
index c136034..0000000
Binary files a/tests/pass/wk-heartbeat-u/u_4 and /dev/null differ

diff --git a/tests/pass/wk-heartbeat-u/u_5 b/tests/pass/wk-heartbeat-u/u_5
deleted file mode 100755 (executable)
index a0a5881..0000000
Binary files a/tests/pass/wk-heartbeat-u/u_5 and /dev/null differ

diff --git a/tests/pass/wk-heartbeat-u/u_6 b/tests/pass/wk-heartbeat-u/u_6
deleted file mode 100755 (executable)
index b1c8520..0000000
Binary files a/tests/pass/wk-heartbeat-u/u_6 and /dev/null differ

diff --git a/tests/pass/wk-heartbeat-u/u_7 b/tests/pass/wk-heartbeat-u/u_7
deleted file mode 100755 (executable)
index 05f7393..0000000
Binary files a/tests/pass/wk-heartbeat-u/u_7 and /dev/null differ

diff --git a/tests/run.sh b/tests/run.sh
deleted file mode 100755 (executable)
index 8556098..0000000
--- a/tests/run.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-#pass/run.sh
-
-cd fail/
-./run.sh