sanitycheck: do no overide OVERLAY_CONFIG We have been overriding OVERLAY_CONFIG coming from tests. Concat all files and create one variable that we pass to kconfig as list. Fixes #13320 Signed-off-by: Anas Nashif <anas.nashif@intel.com>
diff --git a/scripts/sanitycheck b/scripts/sanitycheck index d29e564..4fec286 100755 --- a/scripts/sanitycheck +++ b/scripts/sanitycheck
@@ -1258,9 +1258,20 @@ by execute() will be keyed by its .name field. """ args = ti.test.extra_args[:] + + # merge overlay files into one variable + overlays = "" + idx = 0 + for a in args: + m = re.search('OVERLAY_CONFIG="(.*)"', a) + if m: + overlays += m.group(1) + del args[idx] + idx += 1 + if len(ti.test.extra_configs) > 0 or options.coverage: - args.append("OVERLAY_CONFIG=%s" % - os.path.join(ti.outdir, "overlay.conf")) + args.append("OVERLAY_CONFIG=\"%s %s\"" %(overlays, + os.path.join(ti.outdir, "overlay.conf"))) if ti.test.type == "unit" and options.enable_coverage: args.append("COVERAGE=1")