Remove 1.9 deprecated test cases

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

diff --git a/README b/README
index f10f8adc415eae6f8be605cd25c24d197d4245a1..52b8fa28651ea1b1e2789d2c2e4221b4b5eb7d4b 100644 (file)
--- a/README
+++ b/README
@@ -1,8 +1,9 @@
 ctf-testsuite
 =============
 
-The Common Trace Format (CTF) testsuite is intended to validate the conformance of CTF readers.
+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/1.8/ or tests/1.9/ folder,
-depending on the CTF specification version you want to check.
+use the run.sh script found in the tests/x.y/ folder, x.y being the CTF
+specification version you want to check.

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

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

diff --git a/tests/1.9/fail/fail1/metadata b/tests/1.9/fail/fail1/metadata
deleted file mode 100644 (file)
index 28185f5..0000000
--- a/tests/1.9/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/1.9/fail/fail2/metadata b/tests/1.9/fail/fail2/metadata
deleted file mode 100644 (file)
index 456661e..0000000
Binary files a/tests/1.9/fail/fail2/metadata and /dev/null differ

diff --git a/tests/1.9/fail/integer-range/metadata b/tests/1.9/fail/integer-range/metadata
deleted file mode 100644 (file)
index 3574940..0000000
--- a/tests/1.9/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/1.9/fail/lttng-modules-2.0-pre1/metadata b/tests/1.9/fail/lttng-modules-2.0-pre1/metadata
deleted file mode 100755 (executable)
index 6f92a29..0000000
Binary files a/tests/1.9/fail/lttng-modules-2.0-pre1/metadata and /dev/null differ

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

diff --git a/tests/1.9/fail/run.sh b/tests/1.9/fail/run.sh
deleted file mode 100755 (executable)
index 1c0bdd2..0000000
--- a/tests/1.9/fail/run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-. ../../../utils/run.sh

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

diff --git a/tests/1.9/fail/smalltrace/metadata b/tests/1.9/fail/smalltrace/metadata
deleted file mode 100644 (file)
index 86f8e0a..0000000
--- a/tests/1.9/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/1.9/fail/test.sh b/tests/1.9/fail/test.sh
deleted file mode 100755 (executable)
index 8d9d62e..0000000
--- a/tests/1.9/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/1.9/fail/types01/metadata b/tests/1.9/fail/types01/metadata
deleted file mode 100644 (file)
index f734c50..0000000
--- a/tests/1.9/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/1.9/fail/types02/metadata b/tests/1.9/fail/types02/metadata
deleted file mode 100644 (file)
index 64caaec..0000000
--- a/tests/1.9/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/1.9/fail/types03/metadata b/tests/1.9/fail/types03/metadata
deleted file mode 100644 (file)
index 66fdd53..0000000
--- a/tests/1.9/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/1.9/fail/types04/metadata b/tests/1.9/fail/types04/metadata
deleted file mode 100644 (file)
index c3939db..0000000
--- a/tests/1.9/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/1.9/fail/types05/metadata b/tests/1.9/fail/types05/metadata
deleted file mode 100644 (file)
index 6d87f56..0000000
--- a/tests/1.9/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/1.9/fail/types06/metadata b/tests/1.9/fail/types06/metadata
deleted file mode 100644 (file)
index 2d60c33..0000000
--- a/tests/1.9/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/1.9/fail/types07/metadata b/tests/1.9/fail/types07/metadata
deleted file mode 100644 (file)
index 4b97a9c..0000000
--- a/tests/1.9/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/1.9/fail/types08/metadata b/tests/1.9/fail/types08/metadata
deleted file mode 100644 (file)
index c2fd4af..0000000
--- a/tests/1.9/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/1.9/fail/types09/metadata b/tests/1.9/fail/types09/metadata
deleted file mode 100644 (file)
index 7f5f142..0000000
--- a/tests/1.9/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/1.9/fail/types10/metadata b/tests/1.9/fail/types10/metadata
deleted file mode 100644 (file)
index 86b6496..0000000
--- a/tests/1.9/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/1.9/fail/types11/metadata b/tests/1.9/fail/types11/metadata
deleted file mode 100644 (file)
index 6ac5b82..0000000
--- a/tests/1.9/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/1.9/fail/types12/metadata b/tests/1.9/fail/types12/metadata
deleted file mode 100644 (file)
index 8057394..0000000
--- a/tests/1.9/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/1.9/fail/types13/metadata b/tests/1.9/fail/types13/metadata
deleted file mode 100644 (file)
index d379426..0000000
--- a/tests/1.9/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/1.9/fail/types14/metadata b/tests/1.9/fail/types14/metadata
deleted file mode 100644 (file)
index 051c230..0000000
--- a/tests/1.9/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/1.9/fail/types15/metadata b/tests/1.9/fail/types15/metadata
deleted file mode 100644 (file)
index 6343188..0000000
--- a/tests/1.9/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/1.9/fail/types16/metadata b/tests/1.9/fail/types16/metadata
deleted file mode 100644 (file)
index 4eeb883..0000000
--- a/tests/1.9/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/1.9/fail/types17/metadata b/tests/1.9/fail/types17/metadata
deleted file mode 100644 (file)
index abeee11..0000000
--- a/tests/1.9/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/1.9/fail/types18/metadata b/tests/1.9/fail/types18/metadata
deleted file mode 100644 (file)
index 3477e20..0000000
--- a/tests/1.9/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/1.9/fail/types19/metadata b/tests/1.9/fail/types19/metadata
deleted file mode 100644 (file)
index 6d88bad..0000000
--- a/tests/1.9/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/1.9/fail/types20/metadata b/tests/1.9/fail/types20/metadata
deleted file mode 100644 (file)
index 7f7405c..0000000
--- a/tests/1.9/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/1.9/fail/types21/metadata b/tests/1.9/fail/types21/metadata
deleted file mode 100644 (file)
index 9933b4e..0000000
--- a/tests/1.9/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/1.9/fail/types22/metadata b/tests/1.9/fail/types22/metadata
deleted file mode 100644 (file)
index eb05c32..0000000
--- a/tests/1.9/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/1.9/fail/types23/metadata b/tests/1.9/fail/types23/metadata
deleted file mode 100644 (file)
index 326f730..0000000
--- a/tests/1.9/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/1.9/fail/types24/metadata b/tests/1.9/fail/types24/metadata
deleted file mode 100644 (file)
index 666933a..0000000
--- a/tests/1.9/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/1.9/fail/types25/metadata b/tests/1.9/fail/types25/metadata
deleted file mode 100644 (file)
index 5ca0fb5..0000000
--- a/tests/1.9/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/1.9/fail/types26/metadata b/tests/1.9/fail/types26/metadata
deleted file mode 100644 (file)
index 3d1b760..0000000
--- a/tests/1.9/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/1.9/pass/empty-stream-no-header/emptystream b/tests/1.9/pass/empty-stream-no-header/emptystream
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/tests/1.9/pass/empty-stream-no-header/metadata b/tests/1.9/pass/empty-stream-no-header/metadata
deleted file mode 100644 (file)
index d4a73a3..0000000
--- a/tests/1.9/pass/empty-stream-no-header/metadata
+++ /dev/null
@@ -1,15 +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;
-};
-
-event {
-       name = string;
-       fields := struct { string str; };
-};

diff --git a/tests/1.9/pass/empty-stream/emptystream b/tests/1.9/pass/empty-stream/emptystream
deleted file mode 100644 (file)
index 8cc80f6..0000000
--- a/tests/1.9/pass/empty-stream/emptystream
+++ /dev/null
@@ -1 +0,0 @@
-Á\1füÁ*d"Ðlî\11à\8c\bË\a׳¥d
\ No newline at end of file

diff --git a/tests/1.9/pass/empty-stream/metadata b/tests/1.9/pass/empty-stream/metadata
deleted file mode 100644 (file)
index 86f8e0a..0000000
--- a/tests/1.9/pass/empty-stream/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/1.9/pass/env-warning/dummystream b/tests/1.9/pass/env-warning/dummystream
deleted file mode 100644 (file)
index 53d735e..0000000
Binary files a/tests/1.9/pass/env-warning/dummystream and /dev/null differ

diff --git a/tests/1.9/pass/env-warning/metadata b/tests/1.9/pass/env-warning/metadata
deleted file mode 100644 (file)
index f3618e2..0000000
--- a/tests/1.9/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/1.9/pass/lttng-modules-2.0-pre5/channel0_0 b/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_0
deleted file mode 100755 (executable)
index 528aa6c..0000000
Binary files a/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_0 and /dev/null 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
deleted file mode 100755 (executable)
index 41ac45a..0000000
Binary files a/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_1 and /dev/null 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
deleted file mode 100755 (executable)
index b6fc7f7..0000000
Binary files a/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_2 and /dev/null 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
deleted file mode 100755 (executable)
index b79f6cb..0000000
Binary files a/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_3 and /dev/null 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
deleted file mode 100755 (executable)
index 3ff7ea5..0000000
Binary files a/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_4 and /dev/null 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
deleted file mode 100755 (executable)
index ed41169..0000000
Binary files a/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_5 and /dev/null 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
deleted file mode 100755 (executable)
index 89502f0..0000000
Binary files a/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_6 and /dev/null 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
deleted file mode 100755 (executable)
index 1199fac..0000000
Binary files a/tests/1.9/pass/lttng-modules-2.0-pre5/channel0_7 and /dev/null 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
deleted file mode 100755 (executable)
index de5959a..0000000
Binary files a/tests/1.9/pass/lttng-modules-2.0-pre5/metadata and /dev/null differ

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

diff --git a/tests/1.9/pass/run.sh b/tests/1.9/pass/run.sh
deleted file mode 100755 (executable)
index 1c0bdd2..0000000
--- a/tests/1.9/pass/run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-. ../../../utils/run.sh

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

diff --git a/tests/1.9/pass/smalltrace/metadata b/tests/1.9/pass/smalltrace/metadata
deleted file mode 100644 (file)
index 86f8e0a..0000000
--- a/tests/1.9/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/1.9/pass/string-concat/metadata b/tests/1.9/pass/string-concat/metadata
deleted file mode 100644 (file)
index d4440b8..0000000
--- a/tests/1.9/pass/string-concat/metadata
+++ /dev/null
@@ -1,5 +0,0 @@
-/* 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
deleted file mode 100644 (file)
index 53d735e..0000000
Binary files a/tests/1.9/pass/string-literal-escape/dummystream and /dev/null differ

diff --git a/tests/1.9/pass/string-literal-escape/metadata b/tests/1.9/pass/string-literal-escape/metadata
deleted file mode 100644 (file)
index 71d6c18..0000000
--- a/tests/1.9/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/1.9/pass/succeed1/dummystream b/tests/1.9/pass/succeed1/dummystream
deleted file mode 100644 (file)
index 53d735e..0000000
Binary files a/tests/1.9/pass/succeed1/dummystream and /dev/null differ

diff --git a/tests/1.9/pass/succeed1/metadata b/tests/1.9/pass/succeed1/metadata
deleted file mode 100644 (file)
index f88ffb0..0000000
--- a/tests/1.9/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/1.9/pass/succeed2/dummystream b/tests/1.9/pass/succeed2/dummystream
deleted file mode 100644 (file)
index 53d735e..0000000
Binary files a/tests/1.9/pass/succeed2/dummystream and /dev/null differ

diff --git a/tests/1.9/pass/succeed2/metadata b/tests/1.9/pass/succeed2/metadata
deleted file mode 100644 (file)
index 10a288f..0000000
--- a/tests/1.9/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/1.9/pass/succeed4/metadata b/tests/1.9/pass/succeed4/metadata
deleted file mode 100644 (file)
index a3d401a..0000000
--- a/tests/1.9/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/1.9/pass/test.sh b/tests/1.9/pass/test.sh
deleted file mode 100755 (executable)
index e4506a3..0000000
--- a/tests/1.9/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/1.9/pass/test/channel0_0 b/tests/1.9/pass/test/channel0_0
deleted file mode 100755 (executable)
index 528aa6c..0000000
Binary files a/tests/1.9/pass/test/channel0_0 and /dev/null differ

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

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

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

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

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

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

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

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

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

diff --git a/tests/1.9/pass/warnings/metadata b/tests/1.9/pass/warnings/metadata
deleted file mode 100644 (file)
index 30ca784..0000000
--- a/tests/1.9/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/1.9/pass/wk-heartbeat-u/metadata b/tests/1.9/pass/wk-heartbeat-u/metadata
deleted file mode 100755 (executable)
index e35f463..0000000
Binary files a/tests/1.9/pass/wk-heartbeat-u/metadata and /dev/null differ

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

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

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

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

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

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

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

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

diff --git a/tests/1.9/run.sh b/tests/1.9/run.sh
deleted file mode 100755 (executable)
index 4cec2e1..0000000
--- a/tests/1.9/run.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-echo "Running expected pass tests"
-cd pass
-./run.sh
-cd ..
-
-echo "Running expected failure tests"
-cd fail
-./run.sh
-cd ..