Skip to content

Commit

Permalink
[lldb] Enable TestFrameFormatNameWithArgs in case of cross compilation
Browse files Browse the repository at this point in the history
TestFrameFormatNameWithArgs.test is enabled only in case of native
compilation but is applicable in case of cross compilation too. So,
provision support for enabling it in case of both, native and cross
compilation.

Reviewed By: Michael137

Differential Revision: https://reviews.llvm.org/D140839
  • Loading branch information
ayushsahay1837 committed Feb 1, 2023
1 parent 7a6b4e9 commit 0803241
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
2 changes: 1 addition & 1 deletion lldb/test/Shell/Settings/TestFrameFormatNameWithArgs.test
@@ -1,5 +1,5 @@
# UNSUPPORTED: system-windows
# RUN: %clangxx_host -g -O0 %S/Inputs/names.cpp -std=c++17 -o %t.out
# RUN: %build %S/Inputs/names.cpp --std c++17 -o %t.out
# RUN: %lldb -b -s %s %t.out | FileCheck %s
settings set -f frame-format "frame ${function.name-with-args}\n"
break set -n foo
Expand Down
14 changes: 14 additions & 0 deletions lldb/test/Shell/helper/build.py
Expand Up @@ -110,6 +110,12 @@
nargs='+',
help='Source file(s) to compile / object file(s) to link')

parser.add_argument('--std',
metavar='std',
dest='std',
required=False,
help='Specify the C/C++ standard.')


args = parser.parse_args(args=sys.argv[1:])

Expand Down Expand Up @@ -231,6 +237,7 @@ def __init__(self, toolchain_type, args, obj_ext):
self.verbose = args.verbose
self.obj_ext = obj_ext
self.lib_paths = args.libs_dir
self.std = args.std

def _exe_file_name(self):
assert self.mode != 'compile'
Expand Down Expand Up @@ -581,6 +588,9 @@ def _get_compilation_command(self, source, obj):
args.append('--')
args.append(source)

if self.std:
args.append('/std:' + self.std)

return ('compiling', [source], obj,
self.compile_env,
args)
Expand Down Expand Up @@ -652,6 +662,9 @@ def _get_compilation_command(self, source, obj):
if sys.platform == 'darwin':
args.extend(['-isysroot', self.apple_sdk])

if self.std:
args.append('-std={0}'.format(self.std))

return ('compiling', [source], obj, None, args)

def _get_link_command(self):
Expand Down Expand Up @@ -789,6 +802,7 @@ def fix_arguments(args):
print(' Verbose: ' + str(args.verbose))
print(' Dryrun: ' + str(args.dry))
print(' Inputs: ' + format_text(args.inputs, 0, 10))
print(' C/C++ Standard: ' + str(args.std))
print('Script Environment:')
print_environment(os.environ)

Expand Down

0 comments on commit 0803241

Please sign in to comment.