Update paths pointing to tests/data_files
These now point to framework/data_files instead.
Signed-off-by: David Horstmann <david.horstmann@arm.com>
diff --git a/tests/scripts/audit-validity-dates.py b/tests/scripts/audit-validity-dates.py
index 44b083d..c8b0122 100755
--- a/tests/scripts/audit-validity-dates.py
+++ b/tests/scripts/audit-validity-dates.py
@@ -8,7 +8,7 @@
This script is used to audit the validity date of crt/crl/csr used for testing.
It prints the information about X.509 objects excluding the objects that
are valid throughout the desired validity period. The data are collected
-from tests/data_files/ and tests/suites/*.data files by default.
+from framework/data_files/ and tests/suites/*.data files by default.
"""
import os
@@ -269,12 +269,13 @@
class TestDataAuditor(Auditor):
- """Class for auditing files in `tests/data_files/`"""
+ """Class for auditing files in `framework/data_files/`"""
def collect_default_files(self):
- """Collect all files in `tests/data_files/`"""
+ """Collect all files in `framework/data_files/`"""
test_dir = self.find_test_dir()
- test_data_glob = os.path.join(test_dir, 'data_files/**')
+ test_data_glob = os.path.join(test_dir, os.path.pardir, 'framework',
+ 'data_files/**')
data_files = [f for f in glob.glob(test_data_glob, recursive=True)
if os.path.isfile(f)]
return data_files
diff --git a/tests/scripts/check_files.py b/tests/scripts/check_files.py
index 5e9ea7d..2a5d64b 100755
--- a/tests/scripts/check_files.py
+++ b/tests/scripts/check_files.py
@@ -107,12 +107,12 @@
r'docs/.*\.pdf\Z',
r'docs/.*\.png\Z',
r'programs/fuzz/corpuses/[^.]+\Z',
- r'tests/data_files/[^.]+\Z',
- r'tests/data_files/.*\.(crt|csr|db|der|key|pubkey)\Z',
- r'tests/data_files/.*\.req\.[^/]+\Z',
- r'tests/data_files/.*malformed[^/]+\Z',
- r'tests/data_files/format_pkcs12\.fmt\Z',
- r'tests/data_files/.*\.bin\Z',
+ r'framework/data_files/[^.]+\Z',
+ r'framework/data_files/.*\.(crt|csr|db|der|key|pubkey)\Z',
+ r'framework/data_files/.*\.req\.[^/]+\Z',
+ r'framework/data_files/.*malformed[^/]+\Z',
+ r'framework/data_files/format_pkcs12\.fmt\Z',
+ r'framework/data_files/.*\.bin\Z',
]
BINARY_FILE_PATH_RE = re.compile('|'.join(BINARY_FILE_PATH_RE_LIST))
diff --git a/tests/scripts/generate_tls13_compat_tests.py b/tests/scripts/generate_tls13_compat_tests.py
index 8b28590..39e021c 100755
--- a/tests/scripts/generate_tls13_compat_tests.py
+++ b/tests/scripts/generate_tls13_compat_tests.py
@@ -20,17 +20,17 @@
Certificate = namedtuple("Certificate", ['cafile', 'certfile', 'keyfile'])
# define the certificate parameters for signature algorithms
CERTIFICATES = {
- 'ecdsa_secp256r1_sha256': Certificate('data_files/test-ca2.crt',
- 'data_files/ecdsa_secp256r1.crt',
- 'data_files/ecdsa_secp256r1.key'),
- 'ecdsa_secp384r1_sha384': Certificate('data_files/test-ca2.crt',
- 'data_files/ecdsa_secp384r1.crt',
- 'data_files/ecdsa_secp384r1.key'),
- 'ecdsa_secp521r1_sha512': Certificate('data_files/test-ca2.crt',
- 'data_files/ecdsa_secp521r1.crt',
- 'data_files/ecdsa_secp521r1.key'),
- 'rsa_pss_rsae_sha256': Certificate('data_files/test-ca_cat12.crt',
- 'data_files/server2-sha256.crt', 'data_files/server2.key'
+ 'ecdsa_secp256r1_sha256': Certificate('../framework/data_files/test-ca2.crt',
+ '../framework/data_files/ecdsa_secp256r1.crt',
+ '../framework/data_files/ecdsa_secp256r1.key'),
+ 'ecdsa_secp384r1_sha384': Certificate('../framework/data_files/test-ca2.crt',
+ '../framework/data_files/ecdsa_secp384r1.crt',
+ '../framework/data_files/ecdsa_secp384r1.key'),
+ 'ecdsa_secp521r1_sha512': Certificate('../framework/data_files/test-ca2.crt',
+ '../framework/data_files/ecdsa_secp521r1.crt',
+ '../framework/data_files/ecdsa_secp521r1.key'),
+ 'rsa_pss_rsae_sha256': Certificate('../framework/data_files/test-ca_cat12.crt',
+ '../framework/data_files/server2-sha256.crt', '../framework/data_files/server2.key'
)
}