Changeset 623a641 in rtems-tools

Timestamp:

01/31/18 22:42:59 (5 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

5, master

Children:

005f995

Parents:

0333442

Message:

rtems-bsp-builder: Add a check for invalid ARCH and BSP names.

If invalid characters are in a BSP or ARCH name generate an error.

Add the missing ',' to the line in the PowerPC BSP configuration.

Location:

tester

Files:

• rt/check.py (modified) (3 diffs)
• rtems/rtems-bsps-powerpc.ini (modified) (1 diff)

tester/rt/check.py

@@ -1 +1 @@
 #
 # RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2016-2017 Chris Johns (chrisj@rtems.org)
+# Copyright 2016-2018 Chris Johns (chrisj@rtems.org)
 # All rights reserved.
 #
@@ -936 +936 @@
                 profile[bsps] = self.config.comma_list(profile['name'], bsps)
             self.profiles[profile['name']] = profile
+        invalid_chars = re.compile(r'[^a-zA-Z0-9_-]')
         for a in set(archs):
+            if len(invalid_chars.findall(a)) != 0:
+                raise error.general('invalid character(s) in arch name: %s' % (a))
             arch = {}
             arch['excludes'] = {}
@@ -950 +953 @@
             arch['bsps'] = self.config.comma_list(a, 'bsps', err = False)
             for b in arch['bsps']:
+                if len(invalid_chars.findall(b)) != 0:
+                    raise error.general('invalid character(s) in BSP name: %s' % (b))
                 arch[b] = {}
                 arch[b]['bspopts'] = \

tester/rtems/rtems-bsps-powerpc.ini

@@ -43 +43 @@
        psim,
        qemuppc, qemuprep, qemuprep-altivec,
-       qoriq_core_0, qoriq_core_1, qoriq_e500, qoriq_e6500_32, qoriq_e6500_64
+       qoriq_core_0, qoriq_core_1, qoriq_e500, qoriq_e6500_32, qoriq_e6500_64,
        ss555,
        t32mppc,