[llvm] 91095fe - [lit] Refactor merging of user parameters
Julian Lettner via llvm-commits
llvm-commits at lists.llvm.org
Mon Oct 28 14:11:53 PDT 2019
Author: Julian Lettner
Date: 2019-10-28T14:11:15-07:00
New Revision: 91095fe0726e7d6bdd9c147a734f1287eb8eb8a4
URL: https://github.com/llvm/llvm-project/commit/91095fe0726e7d6bdd9c147a734f1287eb8eb8a4
DIFF: https://github.com/llvm/llvm-project/commit/91095fe0726e7d6bdd9c147a734f1287eb8eb8a4.diff
LOG: [lit] Refactor merging of user parameters
Added:
Modified:
llvm/utils/lit/lit/cl_arguments.py
llvm/utils/lit/lit/main.py
Removed:
################################################################################
diff --git a/llvm/utils/lit/lit/cl_arguments.py b/llvm/utils/lit/lit/cl_arguments.py
index 6c5535864809..5fb2f13beb97 100644
--- a/llvm/utils/lit/lit/cl_arguments.py
+++ b/llvm/utils/lit/lit/cl_arguments.py
@@ -28,7 +28,7 @@ def parse_args():
help="Prefix for 'lit' config files",
default=None)
parser.add_argument("-D", "--param",
- dest="userParameters",
+ dest="user_params",
metavar="NAME=VAL",
help="Add 'NAME' = 'VAL' to the user defined parameters",
type=str,
diff --git a/llvm/utils/lit/lit/main.py b/llvm/utils/lit/lit/main.py
index 9372886acb4b..3f6595d11e1a 100755
--- a/llvm/utils/lit/lit/main.py
+++ b/llvm/utils/lit/lit/main.py
@@ -16,14 +16,14 @@
import lit.Test
import lit.util
-def main(builtinParameters = {}):
+def main(builtin_params = {}):
opts = lit.cl_arguments.parse_args()
if opts.show_version:
print("lit %s" % (lit.__version__,))
return
- userParams = create_user_parameters(builtinParameters, opts)
+ params = create_params(builtin_params, opts.user_params)
isWindows = platform.system() == 'Windows'
litConfig = lit.LitConfig.LitConfig(
@@ -36,7 +36,7 @@ def main(builtinParameters = {}):
noExecute = opts.noExecute,
debug = opts.debug,
isWindows = isWindows,
- params = userParams,
+ params = params,
config_prefix = opts.configPrefix,
maxFailures = opts.maxFailures,
echo_all_commands = opts.echoAllCommands)
@@ -95,15 +95,13 @@ def main(builtinParameters = {}):
sys.exit(1)
-def create_user_parameters(builtinParameters, opts):
- userParams = dict(builtinParameters)
- for entry in opts.userParameters:
- if '=' not in entry:
- name,val = entry,''
- else:
- name,val = entry.split('=', 1)
- userParams[name] = val
- return userParams
+def create_params(builtin_params, user_params):
+ def parse(p):
+ return p.split('=', 1) if '=' in p else (p, '')
+
+ params = dict(builtin_params)
+ params.update([parse(p) for p in user_params])
+ return params
def print_suites_or_tests(tests, opts):
# Aggregate the tests by suite.
More information about the llvm-commits
mailing list