This revision was automatically updated to reflect the committed changes.
Closed by commit rL369272: [dotest] Add --dwarf-version to override the tested
DWARF version. (authored by JDevlieghere, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
Changed prior to commit:
https://reviews.llvm.org/D66370?vs=215702&id=215920#toc
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D66370/new/
https://reviews.llvm.org/D66370
Files:
lldb/trunk/packages/Python/lldbsuite/test/configuration.py
lldb/trunk/packages/Python/lldbsuite/test/decorators.py
lldb/trunk/packages/Python/lldbsuite/test/dotest.py
lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py
lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
Index: lldb/trunk/packages/Python/lldbsuite/test/configuration.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/configuration.py
+++ lldb/trunk/packages/Python/lldbsuite/test/configuration.py
@@ -43,6 +43,9 @@
arch = None # Must be initialized after option parsing
compiler = None # Must be initialized after option parsing
+# The overriden dwarf verison.
+dwarf_version = 0
+
# Path to the FileCheck testing tool. Not optional.
filecheck = None
Index: lldb/trunk/packages/Python/lldbsuite/test/decorators.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/decorators.py
+++ lldb/trunk/packages/Python/lldbsuite/test/decorators.py
@@ -194,11 +194,9 @@
macos_version[0],
macos_version[1],
platform.mac_ver()[0])))
- skip_for_dwarf_version = (
- dwarf_version is None) or (
- (self.getDebugInfo() is 'dwarf') and
- _check_expected_version(
- dwarf_version[0], dwarf_version[1],
self.getDwarfVersion()))
+ skip_for_dwarf_version = (dwarf_version is None) or (
+ _check_expected_version(dwarf_version[0], dwarf_version[1],
+ self.getDwarfVersion()))
# For the test to be skipped, all specified (e.g. not None) parameters
must be True.
# An unspecified parameter means "any", so those are marked skip by
default. And we skip
Index: lldb/trunk/packages/Python/lldbsuite/test/dotest.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest.py
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest.py
@@ -342,9 +342,15 @@
configuration.skipCategories += test_categories.validate(
args.skipCategories, False)
+ cflags_extras = ""
if args.E:
- cflags_extras = args.E
- os.environ['CFLAGS_EXTRAS'] = cflags_extras
+ 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
if args.d:
sys.stdout.write(
Index: lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py
@@ -126,6 +126,12 @@
action='store_true',
help='A flag to indicate an out-of-tree debug server is being used')
group.add_argument(
+ '--dwarf-version',
+ metavar='dwarf_version',
+ dest='dwarf_version',
+ type=int,
+ help='Override the DWARF version.')
+ group.add_argument(
'-s',
metavar='name',
help='Specify the name of the dir created to store the session files
of tests with errored or failed status. If not specified, the test driver uses
the timestamp as the session dir name')
Index: lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
+++ lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
@@ -1290,6 +1290,8 @@
def getDwarfVersion(self):
""" Returns the dwarf version generated by clang or '0'. """
+ if configuration.dwarf_version:
+ return str(configuration.dwarf_version)
if 'clang' in self.getCompiler():
try:
driver_output = check_output(
Index: lldb/trunk/packages/Python/lldbsuite/test/configuration.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/configuration.py
+++ lldb/trunk/packages/Python/lldbsuite/test/configuration.py
@@ -43,6 +43,9 @@
arch = None # Must be initialized after option parsing
compiler = None # Must be initialized after option parsing
+# The overriden dwarf verison.
+dwarf_version = 0
+
# Path to the FileCheck testing tool. Not optional.
filecheck = None
Index: lldb/trunk/packages/Python/lldbsuite/test/decorators.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/decorators.py
+++ lldb/trunk/packages/Python/lldbsuite/test/decorators.py
@@ -194,11 +194,9 @@
macos_version[0],
macos_version[1],
platform.mac_ver()[0])))
- skip_for_dwarf_version = (
- dwarf_version is None) or (
- (self.getDebugInfo() is 'dwarf') and
- _check_expected_version(
- dwarf_version[0], dwarf_version[1], self.getDwarfVersion()))
+ skip_for_dwarf_version = (dwarf_version is None) or (
+ _check_expected_version(dwarf_version[0], dwarf_version[1],
+ self.getDwarfVersion()))
# For the test to be skipped, all specified (e.g. not None) parameters must be True.
# An unspecified parameter means "any", so those are marked skip by default. And we skip
Index: lldb/trunk/packages/Python/lldbsuite/test/dotest.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest.py
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest.py
@@ -342,9 +342,15 @@
configuration.skipCategories += test_categories.validate(
args.skipCategories, False)
+ cflags_extras = ""
if args.E:
- cflags_extras = args.E
- os.environ['CFLAGS_EXTRAS'] = cflags_extras
+ 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
if args.d:
sys.stdout.write(
Index: lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py
@@ -126,6 +126,12 @@
action='store_true',
help='A flag to indicate an out-of-tree debug server is being used')
group.add_argument(
+ '--dwarf-version',
+ metavar='dwarf_version',
+ dest='dwarf_version',
+ type=int,
+ help='Override the DWARF version.')
+ group.add_argument(
'-s',
metavar='name',
help='Specify the name of the dir created to store the session files of tests with errored or failed status. If not specified, the test driver uses the timestamp as the session dir name')
Index: lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
+++ lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
@@ -1290,6 +1290,8 @@
def getDwarfVersion(self):
""" Returns the dwarf version generated by clang or '0'. """
+ if configuration.dwarf_version:
+ return str(configuration.dwarf_version)
if 'clang' in self.getCompiler():
try:
driver_output = check_output(
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
