diff options
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/dotest.py | 9 | ||||
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/plugins/builder_base.py | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index 7593c0da4aa..5eb8bd54f59 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -342,15 +342,14 @@ def parseOptionsAndInitTestdirs(): configuration.skipCategories += test_categories.validate( args.skipCategories, False) - cflags_extras = "" if args.E: - cflags_extras += args.E + os.environ['CFLAGS_EXTRAS'] = args.E if args.dwarf_version: configuration.dwarf_version = args.dwarf_version - cflags_extras += '-gdwarf-{}'.format(args.dwarf_version) - - os.environ['CFLAGS_EXTRAS'] = cflags_extras + # We cannot modify CFLAGS_EXTRAS because they're used in test cases + # that explicitly require no debug info. + os.environ['CFLAGS'] = '-gdwarf-{}'.format(configuration.dwarf_version) if args.d: sys.stdout.write( diff --git a/lldb/packages/Python/lldbsuite/test/plugins/builder_base.py b/lldb/packages/Python/lldbsuite/test/plugins/builder_base.py index be891da2d08..44695cecf21 100644 --- a/lldb/packages/Python/lldbsuite/test/plugins/builder_base.py +++ b/lldb/packages/Python/lldbsuite/test/plugins/builder_base.py @@ -116,7 +116,7 @@ def getCmdLine(d): pattern = '%s="%s"' if "win32" in sys.platform else "%s='%s'" def setOrAppendVariable(k, v): - append_vars = ["CFLAGS_EXTRAS", "LD_EXTRAS"] + append_vars = ["CFLAGS", "CFLAGS_EXTRAS", "LD_EXTRAS"] if k in append_vars and k in os.environ: v = os.environ[k] + " " + v return pattern % (k, v) |
