From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 18 Apr 2013 14:21:15 +0000 (-0400)
Subject: Update string literal escape test
X-Git-Url: https://git.efficios.com/?a=commitdiff_plain;h=1884f867492d3fa8ee2b7ba782bf38320a2fb965;p=ctf-testsuite.git

Update string literal escape test

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

diff --git a/tests/pass/list b/tests/pass/list
index c260f3e..ef5388d 100644
--- a/tests/pass/list
+++ b/tests/pass/list
@@ -3,9 +3,9 @@
 ./test.sh smalltrace/
 ./test.sh succeed1/
 ./test.sh succeed2/
-./test.sh succeed3/
 ./test.sh succeed4/
 ./test.sh string-concat/
+./test.sh string-literal-escape/
 ./test.sh test/
 ./test.sh warnings/
 ./test.sh wk-heartbeat-u/
diff --git a/tests/pass/string-literal-escape/dummystream b/tests/pass/string-literal-escape/dummystream
new file mode 100644
index 0000000..53d735e
Binary files /dev/null and b/tests/pass/string-literal-escape/dummystream differ
diff --git a/tests/pass/string-literal-escape/metadata b/tests/pass/string-literal-escape/metadata
new file mode 100644
index 0000000..71d6c18
--- /dev/null
+++ b/tests/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/pass/succeed3/dummystream b/tests/pass/succeed3/dummystream
deleted file mode 100644
index 53d735e..0000000
Binary files a/tests/pass/succeed3/dummystream and /dev/null differ
diff --git a/tests/pass/succeed3/metadata b/tests/pass/succeed3/metadata
deleted file mode 100644
index c180766..0000000
--- a/tests/pass/succeed3/metadata
+++ /dev/null
@@ -1,29 +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;
-	test = "\"";
-	test2 = "?\x20\o040?";
-	test3 = '\n';
-	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; };
-};