Factor out common metadata prologues

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/tests/1.8/stress/metadata/pass/large-metadata/test.py b/tests/1.8/stress/metadata/pass/large-metadata/test.py
index 5fb7a600a4dceaca672ad67a04680239ed71c319..3e470a04721e9ee6bbea1190c2a3a3db3b7540d6 100755 (executable)
--- a/tests/1.8/stress/metadata/pass/large-metadata/test.py
+++ b/tests/1.8/stress/metadata/pass/large-metadata/test.py
@@ -6,23 +6,8 @@ class Test(MetadataTest):
     what = 'large metadata with {size} extra chars'
 
     def write_metadata(self, f):
-        p1 = '''/* CTF 1.8 */
-
-typealias integer { size = 8; align = 8; signed = false; base = 10; } := uint8_t;
-typealias integer { size = 32; align = 8; signed = false; base = hex; } := uint32_t;
-
-trace {
-       major = 0;
-       minor = 0;
-       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-               uint8_t uuid[16];
-       };
-};
-
-event {
+        p1 = \
+'''event {
        name = myevent;
        fields := struct {
                uint8_t f;
@@ -30,6 +15,7 @@ event {
 '''
         p2 = '\n};\n'
 
+        f.write(self.BASIC_PROLOGUE)
         f.write(p1)
 
         for i in range(self.size):

diff --git a/tests/1.8/stress/metadata/pass/long-identifier/test.py b/tests/1.8/stress/metadata/pass/long-identifier/test.py
index b2a7c9a00d444a7579389b94ea3a7227c2f7492f..a51f6630cee66490d3ae802da333442ae51a7c48 100755 (executable)
--- a/tests/1.8/stress/metadata/pass/long-identifier/test.py
+++ b/tests/1.8/stress/metadata/pass/long-identifier/test.py
@@ -7,23 +7,7 @@ class Test(MetadataTest):
 
     def write_metadata(self, f):
         p1 = \
-'''/* CTF 1.8 */
-
-typealias integer { size = 8; align = 8; signed = false; base = 10; } := uint8_t;
-typealias integer { size = 32; align = 8; signed = false; base = hex; } := uint32_t;
-
-trace {
-       major = 0;
-       minor = 0;
-       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-               uint8_t uuid[16];
-       };
-};
-
-event {
+'''event {
        name = myevent;
        fields := struct {
                uint8_t '''
@@ -34,6 +18,7 @@ event {
 };
 '''
 
+        f.write(self.BASIC_PROLOGUE)
         f.write(p1)
 
         for i in range(self.size):

diff --git a/tests/1.8/stress/metadata/pass/many-callsites/test.py b/tests/1.8/stress/metadata/pass/many-callsites/test.py
index bc02a55b3c806d00d68eabc80a9d8612bc342835..2f4c44eefcf8741304b5de334ecda15a0b337b2e 100755 (executable)
--- a/tests/1.8/stress/metadata/pass/many-callsites/test.py
+++ b/tests/1.8/stress/metadata/pass/many-callsites/test.py
@@ -7,23 +7,7 @@ class Test(MetadataTest):
 
     def write_metadata(self, f):
         p1 = \
-'''/* CTF 1.8 */
-
-typealias integer { size = 8; align = 8; signed = false; base = 10; } := uint8_t;
-typealias integer { size = 32; align = 8; signed = false; base = hex; } := uint32_t;
-
-trace {
-       major = 0;
-       minor = 0;
-       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-               uint8_t uuid[16];
-       };
-};
-
-event {
+'''event {
        name = myevent;
 };
 
@@ -40,6 +24,7 @@ event {
 
 '''
 
+        f.write(self.BASIC_PROLOGUE)
         f.write(p1)
 
         for i in range(self.size):

diff --git a/tests/1.8/stress/metadata/pass/many-typealias/test.py b/tests/1.8/stress/metadata/pass/many-typealias/test.py
index 97c9893169b60613cdc4a3b01cb47e59d76fca15..66cc944579510129ad2a342c08e4987881e9d691 100755 (executable)
--- a/tests/1.8/stress/metadata/pass/many-typealias/test.py
+++ b/tests/1.8/stress/metadata/pass/many-typealias/test.py
@@ -6,30 +6,11 @@ class Test(MetadataTest):
     what = '{size} typealiases'
 
     def write_metadata(self, f):
-        p1 = \
-'''/* CTF 1.8 */
-
-typealias integer { size = 8; align = 8; signed = false; base = 10; } := uint8_t;
-typealias integer { size = 32; align = 8; signed = false; base = hex; } := uint32_t;
-
-trace {
-       major = 0;
-       minor = 0;
-       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-               uint8_t uuid[16];
-       };
-};
-
-'''
-
         typealias_fmt = \
 '''typealias integer {{ size = 8; align = 8; signed = false; base = 10; }} := t{name};
 '''
 
-        f.write(p1)
+        f.write(self.BASIC_PROLOGUE)
 
         for i in range(self.size):
             typealias = typealias_fmt.format(name=i)

diff --git a/tests/1.8/stress/metadata/pass/many-typedef/test.py b/tests/1.8/stress/metadata/pass/many-typedef/test.py
index b5c58b2e9c7969c9d50edb25b30056ef479df563..9ec068d59380ae2127c5e7818aeb536b4d4c14a6 100755 (executable)
--- a/tests/1.8/stress/metadata/pass/many-typedef/test.py
+++ b/tests/1.8/stress/metadata/pass/many-typedef/test.py
@@ -6,30 +6,11 @@ class Test(MetadataTest):
     what = '{size} typedefs'
 
     def write_metadata(self, f):
-        p1 = \
-'''/* CTF 1.8 */
-
-typealias integer { size = 8; align = 8; signed = false; base = 10; } := uint8_t;
-typealias integer { size = 32; align = 8; signed = false; base = hex; } := uint32_t;
-
-trace {
-       major = 0;
-       minor = 0;
-       uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
-       byte_order = le;
-       packet.header := struct {
-               uint32_t magic;
-               uint8_t uuid[16];
-       };
-};
-
-'''
-
         typedef_fmt = \
 '''typedef integer {{ size = 8; align = 8; signed = false; base = 10; }} t{name};
 '''
 
-        f.write(p1)
+        f.write(self.BASIC_PROLOGUE)
 
         for i in range(self.size):
             typedef = typedef_fmt.format(name=i)

diff --git a/utils/python/ctftestsuite/stress.py b/utils/python/ctftestsuite/stress.py
index d355fa38a7cc4340ed934091d27d4e44a4a52123..6f85ec5dbd6bfad388fced529d821c3749a26730 100644 (file)
--- a/utils/python/ctftestsuite/stress.py
+++ b/utils/python/ctftestsuite/stress.py
@@ -5,6 +5,25 @@ import os
 
 
 class MetadataTest:
+    BASIC_PROLOGUE = \
+'''/* CTF 1.8 */
+
+typealias integer { size = 8; align = 8; signed = false; base = 10; } := uint8_t;
+typealias integer { size = 32; align = 8; signed = false; base = hex; } := uint32_t;
+
+trace {
+    major = 0;
+    minor = 0;
+    uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
+    byte_order = le;
+    packet.header := struct {
+        uint32_t magic;
+        uint8_t uuid[16];
+    };
+};
+
+'''
+
     def __init__(self):
         self._actions = {
             'prepare': self._prepare,