utils/genrandconfig: add randconfig based --no-toolchains-csv option
PATCH v3 1/1 utils/genrandconfig: add randconfig based --no-toolchains-csv option
Currently we only test a limited set of toolchains that are mostly prebuilt, add a flag to allow using randconfig for randomizing additional toolchain settings instead of randpackageconfig.
To avoid invalid configs we need to add additional config validation filtering and fixups.
Signed-off-by James Hilliard <[email protected]>
---
Changes v2 -> v3:
- properly check exit codes
Changes v1 -> v2:
- refactor fixup_config control flow
--- utils/genrandconfig | 54 +++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 17 deletions(-)
utils/genrandconfig +37 -17
@@ -315,6 +315,10 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE=""\n') configlines.append('BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="%s"\n' % bootscr) + if 'BR2_ROOTFS_SKELETON_CUSTOM=y\n' in configlines and \ + 'BR2_ROOTFS_SKELETON_CUSTOM_PATH=""\n' in configlines: + configlines.remove('BR2_ROOTFS_SKELETON_CUSTOM=y\n') + with open(configfile, "w+") as configf: configf.writelines(configlines)
@@ -331,11 +335,14 @@ def gen_config(args): sysinfo = SystemInfo() - # Select a random toolchain configuration - configs = get_toolchain_configs(args.toolchains_csv, args.buildrootdir) + if args.toolchains_csv: + # Select a random toolchain configuration + configs = get_toolchain_configs(args.toolchains_csv, args.buildrootdir) - i = randint(0, len(configs) - 1) - toolchainconfig = configs[i] + i = randint(0, len(configs) - 1) + toolchainconfig = configs[i] + else: + toolchainconfig = [] configlines = list(toolchainconfig)
@@ -409,19 +416,24 @@ def gen_config(args): bounded_loop -= 1 subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "KCONFIG_PROBABILITY=%d" % randint(1, 20), - "randpackageconfig"]) + "randpackageconfig" if args.toolchains_csv else "randconfig"]) - if fixup_config(sysinfo, configfile): - break + if not fixup_config(sysinfo, configfile): + continue - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, - "olddefconfig"]) + if subprocess.call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, + "olddefconfig"]): + continue - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, - "savedefconfig"]) + if subprocess.call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, + "savedefconfig"]): + continue - return subprocess.call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, - "dependencies"]) + if subprocess.call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, + "dependencies"]): + continue + break + return 0 if __name__ == '__main__':
@@ -433,10 +445,18 @@ if __name__ == '__main__': parser.add_argument("--buildrootdir", "-b", help="Buildroot directory (relative to current directory)", type=str, default='.') - parser.add_argument("--toolchains-csv", - help="Path of the toolchain configuration file", - type=str, - default="support/config-fragments/autobuild/toolchain-configs.csv") + + toolchains_csv = parser.add_mutually_exclusive_group(required=False) + toolchains_csv.add_argument("--toolchains-csv", + dest="toolchains_csv", + help="Path of the toolchain configuration file", + type=str) + toolchains_csv.add_argument("--no-toolchains-csv", + dest="toolchains_csv", + help="Generate random toolchain configuration", + action='store_false') + parser.set_defaults(toolchains_csv="support/config-fragments/autobuild/toolchain-configs.csv") + args = parser.parse_args() # We need the absolute path to use with O=, because the relative
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot