commit d762d94dfbb24dd037426bc7cf5067e8bcbf11fb
author David Horstmann <david.horstmann@arm.com> Wed Jul 03 13:41:32 2024 +0100
committer David Horstmann <david.horstmann@arm.com> Mon Jul 08 15:36:48 2024 +0100
tree 7621a8947bf056a43264f247ca8e703bdfba7ce9
parent 316beb349dae1077ef1486a940ab3e77356281ac

Move variable into generated bash

Move the DATA_FILES_PATH_VAR variable into the generated bash rather
than only variablising it in the python that generates the test script.

Signed-off-by: David Horstmann <david.horstmann@arm.com>

tests/scripts/generate_tls13_compat_tests.py

diff --git a/tests/scripts/generate_tls13_compat_tests.py b/tests/scripts/generate_tls13_compat_tests.py
index daa1d7d..dde37b7 100755
--- a/tests/scripts/generate_tls13_compat_tests.py
+++ b/tests/scripts/generate_tls13_compat_tests.py
@@ -16,23 +16,22 @@
 import itertools
 from collections import namedtuple
 
-DATA_FILES_PATH = '../framework/data_files'
 # define certificates configuration entry
 Certificate = namedtuple("Certificate", ['cafile', 'certfile', 'keyfile'])
 # define the certificate parameters for signature algorithms
 CERTIFICATES = {
-    'ecdsa_secp256r1_sha256': Certificate(DATA_FILES_PATH + '/test-ca2.crt',
-                                          DATA_FILES_PATH + '/ecdsa_secp256r1.crt',
-                                          DATA_FILES_PATH + '/ecdsa_secp256r1.key'),
-    'ecdsa_secp384r1_sha384': Certificate(DATA_FILES_PATH + '/test-ca2.crt',
-                                          DATA_FILES_PATH + '/ecdsa_secp384r1.crt',
-                                          DATA_FILES_PATH + '/ecdsa_secp384r1.key'),
-    'ecdsa_secp521r1_sha512': Certificate(DATA_FILES_PATH + '/test-ca2.crt',
-                                          DATA_FILES_PATH + '/ecdsa_secp521r1.crt',
-                                          DATA_FILES_PATH + '/ecdsa_secp521r1.key'),
-    'rsa_pss_rsae_sha256': Certificate(DATA_FILES_PATH + '/test-ca_cat12.crt',
-                                       DATA_FILES_PATH + '/server2-sha256.crt',
-                                       DATA_FILES_PATH + '/server2.key')
+    'ecdsa_secp256r1_sha256': Certificate('$DATA_FILES_PATH/test-ca2.crt',
+                                          '$DATA_FILES_PATH/ecdsa_secp256r1.crt',
+                                          '$DATA_FILES_PATH/ecdsa_secp256r1.key'),
+    'ecdsa_secp384r1_sha384': Certificate('$DATA_FILES_PATH/test-ca2.crt',
+                                          '$DATA_FILES_PATH/ecdsa_secp384r1.crt',
+                                          '$DATA_FILES_PATH/ecdsa_secp384r1.key'),
+    'ecdsa_secp521r1_sha512': Certificate('$DATA_FILES_PATH/test-ca2.crt',
+                                          '$DATA_FILES_PATH/ecdsa_secp521r1.crt',
+                                          '$DATA_FILES_PATH/ecdsa_secp521r1.key'),
+    'rsa_pss_rsae_sha256': Certificate('$DATA_FILES_PATH/test-ca_cat12.crt',
+                                       '$DATA_FILES_PATH/server2-sha256.crt',
+                                       '$DATA_FILES_PATH/server2.key')
 }
 
 CIPHER_SUITE_IANA_VALUE = {
@@ -550,6 +549,9 @@
 # AND REGENERATE THIS FILE.
 #
 '''
+DATA_FILES_PATH_VAR = '''
+DATA_FILES_PATH=../framework/data_files
+'''
 
 def main():
     """
@@ -629,6 +631,7 @@
             with open(args.output, 'w', encoding="utf-8") as f:
                 f.write(SSL_OUTPUT_HEADER.format(
                     filename=os.path.basename(args.output), cmd=' '.join(sys.argv)))
+                f.write(DATA_FILES_PATH_VAR)
                 f.write('\n\n'.join(get_all_test_cases()))
                 f.write('\n')
         else: