[LNT] r312672 - Make machine selection/update more flexible
Matthias Braun via llvm-commits
llvm-commits at lists.llvm.org
Wed Sep 6 14:57:03 PDT 2017
Author: matze
Date: Wed Sep 6 14:57:03 2017
New Revision: 312672
URL: http://llvm.org/viewvc/llvm-project?rev=312672&view=rev
Log:
Make machine selection/update more flexible
r309247 changed LNTs response to mismatching machine information to
either reject the submission or update the existing machine data. Some
users prefer the previous behavior of creating a separate machine with
the same name instead.
This changes LNT interface to accept an select-machine parameter:
- match: Rejects submission with mismatching machine information
- update: Updates the existing machine on mismatching machine
information.
- split: Creates a new machine with the same name (but different id
number) when none of the existing ones match the machine
information.
Differential Revision: https://reviews.llvm.org/D37083
Added:
lnt/trunk/tests/lnttool/Inputs/compile_submission_machine_diff_split.json
Modified:
lnt/trunk/lnt/lnttool/admin.py
lnt/trunk/lnt/lnttool/common.py
lnt/trunk/lnt/lnttool/import_data.py
lnt/trunk/lnt/lnttool/main.py
lnt/trunk/lnt/lnttool/viewcomparison.py
lnt/trunk/lnt/server/db/testsuitedb.py
lnt/trunk/lnt/server/ui/api.py
lnt/trunk/lnt/server/ui/templates/submit_run.html
lnt/trunk/lnt/server/ui/views.py
lnt/trunk/lnt/tests/builtintest.py
lnt/trunk/lnt/util/ImportData.py
lnt/trunk/lnt/util/ServerUtil.py
lnt/trunk/tests/lnttool/submit.shtest
lnt/trunk/tests/server/db/search.py
Modified: lnt/trunk/lnt/lnttool/admin.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/lnttool/admin.py?rev=312672&r1=312671&r2=312672&view=diff
==============================================================================
--- lnt/trunk/lnt/lnttool/admin.py (original)
+++ lnt/trunk/lnt/lnttool/admin.py Wed Sep 6 14:57:03 2017
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import click
+from .common import submit_options
def _load_dependencies():
@@ -286,11 +287,8 @@ def action_rm_run(config, runs):
@_pass_config
@click.argument("datafiles", nargs=-1, type=click.Path(exists=True),
required=True)
- at click.option("--update-machine", is_flag=True, help="Update machine fields")
- at click.option("--merge", default="replace", show_default=True,
- type=click.Choice(['reject', 'replace', 'merge']),
- help="Merge strategy when run already exists")
-def action_post_run(config, datafiles, update_machine, merge):
+ at submit_options
+def action_post_run(config, datafiles, select_machine, merge):
"""Submit report files to server."""
_check_auth_token(config)
@@ -301,7 +299,7 @@ def action_post_run(config, datafiles, u
url = ('{lnt_url}/api/db_{database}/v4/{testsuite}/runs'
.format(**config.dict))
url_params = {
- 'update_machine': 1 if update_machine else 0,
+ 'select_machine': select_machine,
'merge': merge,
}
response = config.session.post(url, params=url_params, data=data,
Modified: lnt/trunk/lnt/lnttool/common.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/lnttool/common.py?rev=312672&r1=312671&r2=312672&view=diff
==============================================================================
--- lnt/trunk/lnt/lnttool/common.py (original)
+++ lnt/trunk/lnt/lnttool/common.py Wed Sep 6 14:57:03 2017
@@ -6,8 +6,9 @@ import logging
def submit_options(func):
func = click.option("--commit", type=int, help="deprecated/ignored option",
expose_value=False)(func)
- func = click.option("--update-machine", is_flag=True,
- help="Update machine fields")(func)
+ func = click.option("--select-machine", default='match',
+ type=click.Choice(['match', 'update', 'split']),
+ help="How to select and create missing machine")(func)
func = click.option("--merge", default="replace", show_default=True,
type=click.Choice(['reject', 'replace', 'append']),
help="Merge strategy when run already exists")(func)
Modified: lnt/trunk/lnt/lnttool/import_data.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/lnttool/import_data.py?rev=312672&r1=312671&r2=312672&view=diff
==============================================================================
--- lnt/trunk/lnt/lnttool/import_data.py (original)
+++ lnt/trunk/lnt/lnttool/import_data.py Wed Sep 6 14:57:03 2017
@@ -23,7 +23,7 @@ import lnt.formats
@submit_options
def action_import(instance_path, files, database, output_format, show_sql,
show_sample_count, show_raw_result, testsuite, verbose,
- quiet, no_email, no_report, update_machine, merge):
+ quiet, no_email, no_report, select_machine, merge):
"""import test data into a database"""
import contextlib
import lnt.server.instance
@@ -49,7 +49,7 @@ def action_import(instance_path, files,
result = lnt.util.ImportData.import_and_report(
config, database, db, session, file_name,
output_format, testsuite, show_sample_count, no_email,
- no_report, updateMachine=update_machine, mergeRun=merge)
+ no_report, select_machine=select_machine, merge_run=merge)
success &= result.get('success', False)
if quiet:
@@ -59,8 +59,7 @@ def action_import(instance_path, files,
pprint.pprint(result)
else:
lnt.util.ImportData.print_report_result(result, sys.stdout,
- sys.stderr,
- verbose)
+ sys.stderr, verbose)
if not success:
raise SystemExit(1)
Modified: lnt/trunk/lnt/lnttool/main.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/lnttool/main.py?rev=312672&r1=312671&r2=312672&view=diff
==============================================================================
--- lnt/trunk/lnt/lnttool/main.py (original)
+++ lnt/trunk/lnt/lnttool/main.py Wed Sep 6 14:57:03 2017
@@ -182,14 +182,14 @@ def action_showtests():
@submit_options
@click.option("--verbose", "-v", is_flag=True,
help="show verbose test results")
-def action_submit(url, files, update_machine, merge, verbose):
+def action_submit(url, files, select_machine, merge, verbose):
"""submit a test report to the server"""
from lnt.util import ServerUtil
import lnt.util.ImportData
files = ServerUtil.submitFiles(url, files, verbose,
- updateMachine=update_machine,
- mergeRun=merge)
+ select_machine=select_machine,
+ merge_run=merge)
for submitted_file in files:
if verbose:
lnt.util.ImportData.print_report_result(
Modified: lnt/trunk/lnt/lnttool/viewcomparison.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/lnttool/viewcomparison.py?rev=312672&r1=312671&r2=312672&view=diff
==============================================================================
--- lnt/trunk/lnt/lnttool/viewcomparison.py (original)
+++ lnt/trunk/lnt/lnttool/viewcomparison.py Wed Sep 6 14:57:03 2017
@@ -85,9 +85,9 @@ def action_view_comparison(report_a, rep
with contextlib.closing(config.get_database('default')) as db:
session = db.make_session()
r = import_and_report(config, 'default', db, session, report_a,
- '<auto>', testsuite, updateMachine=True)
+ '<auto>', testsuite, select_machine='match')
import_and_report(config, 'default', db, session, report_b,
- '<auto>', testsuite, updateMachine=True)
+ '<auto>', testsuite, select_machine='match')
# Dispatch another thread to start the webbrowser.
comparison_url = '%s/v4/nts/2?compare_to=1' % (url,)
Modified: lnt/trunk/lnt/server/db/testsuitedb.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/db/testsuitedb.py?rev=312672&r1=312671&r2=312672&view=diff
==============================================================================
--- lnt/trunk/lnt/server/db/testsuitedb.py (original)
+++ lnt/trunk/lnt/server/db/testsuitedb.py Wed Sep 6 14:57:03 2017
@@ -772,13 +772,55 @@ class TestSuiteDB(object):
return None
- def _getOrCreateMachine(self, session, machine_data, forceUpdate):
+ def _getIncompatibleFields(self, existing_machine, new_machine):
+ incompatible_fields = set()
+ for field in self.machine_fields:
+ existing_value = existing_machine.get_field(field)
+ new_value = new_machine.get_field(field)
+ if new_value is None or existing_value == new_value:
+ continue
+ if existing_value is not None:
+ incompatible_fields.add(field.name)
+ existing_parameters = existing_machine.parameters
+ for key, new_value in new_machine.parameters.items():
+ existing_value = existing_parameters.get(key, None)
+ if new_value is None or existing_value == new_value:
+ continue
+ if existing_value is not None:
+ incompatible_fields.add(key)
+ return incompatible_fields
+
+ def _updateMachine(self, existing_machine, new_machine):
+ for field in self.machine_fields:
+ new_value = new_machine.get_field(field)
+ if new_value is None:
+ continue
+ existing_machine.set_field(field, new_value)
+ parameters = existing_machine.parameters
+ for key, new_value in new_machine.parameters.items():
+ if new_value is None and parameters.get(key, None) is not None:
+ continue
+ parameters[key] = new_value
+ existing_machine.parameters = parameters
+
+ def _getOrCreateMachine(self, session, machine_data, select_machine):
"""
- _getOrCreateMachine(data, forceUpdate) -> Machine
+ _getOrCreateMachine(data, select_machine) -> Machine
Add or create (and insert) a Machine record from the given machine data
(as recorded by the test interchange format).
+
+ select_machine strategies:
+ 'match': Abort if the existing machine doesn't match the new machine
+ data.
+ 'update': Update the existing machine in cases where the new machine
+ data doesn't match the existing data.
+ 'split': On parameter mismatch create a new machine with a `$NN` suffix
+ added, or choose an existing compatible machine with such a
+ suffix.
"""
+ assert select_machine == 'match' or select_machine == 'update' \
+ or select_machine == 'split'
# Convert the machine data into a machine record.
machine_parameters = machine_data.copy()
@@ -795,46 +837,37 @@ class TestSuiteDB(object):
.filter(self.Machine.name == name) \
.order_by(self.Machine.id.desc()) \
.all()
+ # No existing machine? Add one.
if len(existing_machines) == 0:
session.add(machine)
return machine
-
- existing = existing_machines[0]
-
- # Unfortunately previous LNT versions allowed multiple machines
- # with the same name to exist, so we should choose the one that
- # matches best.
- if len(existing_machines) > 1:
- for m in existing_machines:
- if m.parameters == machine.parameters:
- existing = m
- break
-
- # Check and potentially update existing machine.
- # Parameters that were previously unset are added. If a parameter
- # changed then we update or abort depending on `forceUpdate`.
- for field in self.machine_fields:
- existing_value = existing.get_field(field)
- new_value = machine.get_field(field)
- if new_value is None or existing_value == new_value:
- continue
- if existing_value is None or forceUpdate:
- existing.set_field(field, new_value)
- else:
+ # Search for a compatible machine.
+ existing_machine = None
+ incompatible_fields_0 = []
+ for m in existing_machines:
+ incompatible_fields = self._getIncompatibleFields(m, machine)
+ if len(incompatible_fields) == 0:
+ existing_machine = m
+ break
+ if len(incompatible_fields_0) == 0:
+ incompatible_fields_0 = incompatible_fields
+ # All existing machines are incompatible?
+ if existing_machine is None:
+ if select_machine == 'split':
+ # Add a new machine.
+ session.add(machine)
+ return machine
+ if select_machine == 'match':
raise MachineInfoChanged("'%s' on machine '%s' changed." %
- (field.name, name))
- existing_parameters = existing.parameters
- for key, new_value in machine.parameters.items():
- existing_value = existing_parameters.get(key, None)
- if new_value is None or existing_value == new_value:
- continue
- if existing_value is None or forceUpdate:
- existing_parameters[key] = value
+ (', '.join(incompatible_fields_0),
+ name))
else:
- raise MachineInfoChanged("'%s' on machine '%s' changed." %
- (key, name))
- existing.parameters = existing_parameters
- return existing
+ assert select_machine == 'update'
+ # Just pick the first and update it below.
+ existing_machine = existing_machines[0]
+
+ self._updateMachine(existing_machine, machine)
+ return existing_machine
def _getOrCreateOrder(self, session, run_parameters):
"""
@@ -1008,20 +1041,20 @@ class TestSuiteDB(object):
else:
sample.set_field(field, value)
- def importDataFromDict(self, session, data, config, updateMachine,
- mergeRun):
+ def importDataFromDict(self, session, data, config, select_machine,
+ merge_run):
"""
- importDataFromDict(data, config, updateMachine, mergeRun)
+ importDataFromDict(session, data, config, select_machine, merge_run)
-> Run (or throws ValueError exception)
Import a new run from the provided test interchange data, and return
the constructed Run record. May throw ValueError exceptions in cases
like mismatching machine data or duplicate run submission with
- mergeRun == 'reject'.
+ merge_run == 'reject'.
"""
machine = self._getOrCreateMachine(session, data['machine'],
- updateMachine)
- run = self._getOrCreateRun(session, data['run'], machine, mergeRun)
+ select_machine)
+ run = self._getOrCreateRun(session, data['run'], machine, merge_run)
self._importSampleValues(session, data['tests'], run, config)
return run
Modified: lnt/trunk/lnt/server/ui/api.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/api.py?rev=312672&r1=312671&r2=312672&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/api.py (original)
+++ lnt/trunk/lnt/server/ui/api.py Wed Sep 6 14:57:03 2017
@@ -298,11 +298,11 @@ class Runs(Resource):
session = request.session
db = request.get_db()
data = request.data
- updateMachine = request.values.get('update_machine', False)
+ select_machine = request.values.get('select_machine', 'match')
merge = request.values.get('merge', 'replace')
result = lnt.util.ImportData.import_from_string(
current_app.old_config, g.db_name, db, session, g.testsuite_name,
- data, updateMachine=updateMachine, mergeRun=merge)
+ data, select_machine=select_machine, merge_run=merge)
error = result['error']
if error is not None:
Modified: lnt/trunk/lnt/server/ui/templates/submit_run.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/submit_run.html?rev=312672&r1=312671&r2=312672&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/submit_run.html (original)
+++ lnt/trunk/lnt/server/ui/templates/submit_run.html Wed Sep 6 14:57:03 2017
@@ -14,10 +14,18 @@
<p><b>Input Data (plist):</b><br/>
<textarea name="input_data"></textarea>
-<p><b>Update Machine:</b><br/>
-<select name="update_machine">
-<option selected="selected" value="0">0</option>
-<option value="1">1</option>
+<p><b>Machine Selection / Creation:</b><br/>
+<select name="select_machine">
+<option selected="selected" value="match">match: Abort if machine information doesn't match</option>
+<option value="update">update: Update matchine if information doesn't match</option>
+<option value="split">split: Create additional machine with same name if information doesn't match</option>
+</select><br/>
+
+<p><b>Merge with existing runs:</b><br/>
+<select name="merge">
+<option selected="selected" value="replace">replace: Replace existing run with same order</option>
+<option value="reject">reject: Abort if run with same order exists</option>
+<option value="append">append: Append and possibly keep multiple runs for same order</option>
</select><br/>
<p><input type="submit" name="submit" value="Submit">
Modified: lnt/trunk/lnt/server/ui/views.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/views.py?rev=312672&r1=312671&r2=312672&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/views.py (original)
+++ lnt/trunk/lnt/server/ui/views.py Wed Sep 6 14:57:03 2017
@@ -101,8 +101,14 @@ def _do_submit():
assert request.method == 'POST'
input_file = request.files.get('file')
input_data = request.form.get('input_data')
- updateMachine = int(request.form.get('update_machine', 0)) != 0
- merge = request.form.get('merge', 'replace')
+ if 'select_machine' not in request.form and \
+ 'update_machine' in request.form:
+ # Compatibility with old clients
+ update_machine = int(request.form.get('update_machine', 0)) != 0
+ select_machine = 'update' if update_machine else 'match'
+ else:
+ select_machine = request.form.get('select_machine', 'match')
+ merge_run = request.form.get('merge', 'replace')
if input_file and not input_file.content_length:
input_file = None
@@ -143,7 +149,7 @@ def _do_submit():
result = lnt.util.ImportData.import_from_string(
current_app.old_config, g.db_name, db, session, g.testsuite_name,
- data_value, updateMachine=updateMachine, mergeRun=merge)
+ data_value, select_machine=select_machine, merge_run=merge_run)
# It is nice to have a full URL to the run, so fixup the request URL
# here were we know more about the flask instance.
Modified: lnt/trunk/lnt/tests/builtintest.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/tests/builtintest.py?rev=312672&r1=312671&r2=312672&view=diff
==============================================================================
--- lnt/trunk/lnt/tests/builtintest.py (original)
+++ lnt/trunk/lnt/tests/builtintest.py Wed Sep 6 14:57:03 2017
@@ -75,7 +75,7 @@ class BuiltinTest(object):
self.log("submitting result to %r" % (config.submit_url,))
server_report = ServerUtil.submitFile(
config.submit_url, report_path, config.verbose,
- updateMachine=config.update_machine, mergeRun=config.merge)
+ select_machine=config.select_machine, merge_run=config.merge)
else:
server_report = ImportData.no_submit()
if server_report:
Modified: lnt/trunk/lnt/util/ImportData.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/util/ImportData.py?rev=312672&r1=312671&r2=312672&view=diff
==============================================================================
--- lnt/trunk/lnt/util/ImportData.py (original)
+++ lnt/trunk/lnt/util/ImportData.py Wed Sep 6 14:57:03 2017
@@ -14,11 +14,13 @@ import time
def import_and_report(config, db_name, db, session, file, format, ts_name,
show_sample_count=False, disable_email=False,
- disable_report=False, updateMachine=False,
- mergeRun='replace'):
+ disable_report=False, select_machine='match',
+ merge_run='replace'):
"""
- import_and_report(config, db_name, db, file, format, ts_name,
- [show_sample_count], [disable_email]) -> ... object ...
+ import_and_report(config, db_name, db, session, file, format, ts_name,
+ [show_sample_count], [disable_email],
+ [disable_report], [select_machine], [merge_run])
+ -> ... object ...
Import a test data file into an LNT server and generate a test report. On
success, run is the newly imported run.
@@ -32,6 +34,10 @@ def import_and_report(config, db_name, d
'import_file': file,
}
+ if select_machine not in ('match', 'update', 'split'):
+ result['error'] = "select_machine must be 'match', 'update' or 'split'"
+ return result
+
ts = db.testsuite.get(ts_name, None)
if ts is None:
result['error'] = "Unknown test suite '%s'!" % ts_name
@@ -89,8 +95,8 @@ def import_and_report(config, db_name, d
return result
run = ts.importDataFromDict(session, data, config=db_config,
- updateMachine=updateMachine,
- mergeRun=mergeRun)
+ select_machine=select_machine,
+ merge_run=merge_run)
except KeyboardInterrupt:
raise
except Exception as e:
@@ -98,8 +104,9 @@ def import_and_report(config, db_name, d
result['error'] = "import failure: %s" % e.message
result['message'] = traceback.format_exc()
if isinstance(e, lnt.server.db.testsuitedb.MachineInfoChanged):
- result['message'] += '\n\nNote: Use --update-machine to update ' \
- 'the existing machine information.\n'
+ result['message'] += \
+ '\n\nNote: Use --select-machine=update to update ' \
+ 'the existing machine information.\n'
return result
# If the import succeeded, save the import path.
@@ -157,7 +164,9 @@ def import_and_report(config, db_name, d
shadow_db, shadow_session, file,
format, ts_name,
show_sample_count, disable_email,
- disable_report, updateMachine)
+ disable_report,
+ select_machine=select_machine,
+ merge_run=merge_run)
# Append the shadow result to the result.
result['shadow_result'] = shadow_result
@@ -304,7 +313,7 @@ def print_report_result(result, out, err
def import_from_string(config, db_name, db, session, ts_name, data,
- updateMachine=False, mergeRun='replace'):
+ select_machine='match', merge_run='replace'):
# Stash a copy of the raw submission.
#
# To keep the temporary directory organized, we keep files in
@@ -333,5 +342,5 @@ def import_from_string(config, db_name,
result = lnt.util.ImportData.import_and_report(
config, db_name, db, session, path, '<auto>', ts_name,
- updateMachine=updateMachine, mergeRun=mergeRun)
+ select_machine=select_machine, merge_run=merge_run)
return result
Modified: lnt/trunk/lnt/util/ServerUtil.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/util/ServerUtil.py?rev=312672&r1=312671&r2=312672&view=diff
==============================================================================
--- lnt/trunk/lnt/util/ServerUtil.py (original)
+++ lnt/trunk/lnt/util/ServerUtil.py Wed Sep 6 14:57:03 2017
@@ -29,13 +29,13 @@ def _show_json_error(reply):
sys.stderr.write(message + '\n')
-def submitFileToServer(url, file, updateMachine, mergeRun):
+def submitFileToServer(url, file, select_machine, merge_run):
with open(file, 'rb') as f:
values = {
'input_data': f.read(),
'commit': "1", # compatibility with old servers.
- 'update_machine': "1" if updateMachine else "0",
- 'merge': mergeRun,
+ 'select_machine': select_machine,
+ 'merge': merge_run,
}
headers = {'Accept': 'application/json'}
data = urllib.urlencode(values)
@@ -63,7 +63,8 @@ def submitFileToServer(url, file, update
return reply
-def submitFileToInstance(path, file, updateMachine=False, mergeRun='replace'):
+def submitFileToInstance(path, file, select_machine='match',
+ merge_run='replace'):
# Otherwise, assume it is a local url and submit to the default database
# in the instance.
instance = lnt.server.instance.Instance.frompath(path)
@@ -75,22 +76,25 @@ def submitFileToInstance(path, file, upd
session = db.make_session()
return lnt.util.ImportData.import_and_report(
config, db_name, db, session, file, format='<auto>', ts_name='nts',
- updateMachine=updateMachine, mergeRun=mergeRun)
+ select_machine=select_machine, merge_run=merge_run)
-def submitFile(url, file, verbose, updateMachine=False, mergeRun='replace'):
+def submitFile(url, file, verbose, select_machine='match',
+ merge_run='replace'):
# If this is a real url, submit it using urllib.
if '://' in url:
- result = submitFileToServer(url, file, updateMachine, mergeRun)
+ result = submitFileToServer(url, file, select_machine, merge_run)
else:
- result = submitFileToInstance(url, file, updateMachine, mergeRun)
+ result = submitFileToInstance(url, file, select_machine, merge_run)
return result
-def submitFiles(url, files, verbose, updateMachine=False, mergeRun='replace'):
+def submitFiles(url, files, verbose, select_machine='match',
+ merge_run='replace'):
results = []
for file in files:
- result = submitFile(url, file, verbose, updateMachine, mergeRun)
+ result = submitFile(url, file, verbose, select_machine=select_machine,
+ merge_run=merge_run)
if result:
results.append(result)
return results
Added: lnt/trunk/tests/lnttool/Inputs/compile_submission_machine_diff_split.json
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/lnttool/Inputs/compile_submission_machine_diff_split.json?rev=312672&view=auto
==============================================================================
--- lnt/trunk/tests/lnttool/Inputs/compile_submission_machine_diff_split.json (added)
+++ lnt/trunk/tests/lnttool/Inputs/compile_submission_machine_diff_split.json Wed Sep 6 14:57:03 2017
@@ -0,0 +1,29 @@
+{
+ "Machine": {
+ "Info": {
+ "hw.activecpu": "2",
+ "machdep.cpu.vendor": "AMD"
+ },
+ "Name": "some-compile-suite-machine"
+ },
+ "Run": {
+ "End Time": "2017-07-06 15:37:08",
+ "Start Time": "2017-07-06 15:05:23",
+ "Info": {
+ "__report_version__": "1",
+ "run_order": "663405",
+ "tag": "compile"
+ }
+ },
+ "Tests": [
+ {
+ "Data": [
+ 13.601326,
+ 13.411566,
+ 13.490528
+ ],
+ "Info": {},
+ "Name": "compile.build/Adium-1.5.7(config='Debug',j=1).user"
+ }
+ ]
+}
Modified: lnt/trunk/tests/lnttool/submit.shtest
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/lnttool/submit.shtest?rev=312672&r1=312671&r2=312672&view=diff
==============================================================================
--- lnt/trunk/tests/lnttool/submit.shtest (original)
+++ lnt/trunk/tests/lnttool/submit.shtest Wed Sep 6 14:57:03 2017
@@ -103,7 +103,7 @@ lnt submit "http://localhost:9091/db_def
# CHECK-ERRORS: error: lnt server: import failure: 'hw.activecpu' on machine 'some-compile-suite-machine' changed.
# ...
# CHECK-ERRORS: MachineInfoChanged: 'hw.activecpu' on machine 'some-compile-suite-machine' changed.
-# CHECK-ERRORS: Note: Use --update-machine to update the existing machine information.
+# CHECK-ERRORS: Note: Use --select-machine=update to update the existing machine information.
@@ -123,7 +123,7 @@ lnt submit "http://localhost:9091/db_def
# CHECK-MACHINEDIFF: Results available at: http://localhost:9091/db_default/v4/compile/7
# Test updating existing machine
-lnt submit "http://localhost:9091/db_default/v4/compile/submitRun" "${INPUTS}/compile_submission_machine_diff_reject.json" --update-machine -v > "${OUTPUT_DIR}/submit_compile_machine_update.txt"
+lnt submit "http://localhost:9091/db_default/v4/compile/submitRun" "${INPUTS}/compile_submission_machine_diff_reject.json" --select-machine=update -v > "${OUTPUT_DIR}/submit_compile_machine_update.txt"
# RUN: FileCheck %s --check-prefix=CHECK-UPDATEMACHINE < %t.tmp/submit_compile_machine_update.txt
#
# CHECK-UPDATEMACHINE: Imported Data
@@ -136,3 +136,18 @@ lnt submit "http://localhost:9091/db_def
# CHECK-UPDATEMACHINE: ----------------
# CHECK-UPDATEMACHINE: PASS : 9
# CHECK-UPDATEMACHINE: Results available at: http://localhost:9091/db_default/v4/compile/8
+
+# Test creation of new machines on information mismatch in split mode.
+lnt submit "http://localhost:9091/db_default/v4/compile/submitRun" "${INPUTS}/compile_submission_machine_diff_split.json" --select-machine=split -v > "${OUTPUT_DIR}/submit_compile_machine_split.txt"
+# RUN: FileCheck %s --check-prefix=CHECK-SPLITMACHINE < %t.tmp/submit_compile_machine_split.txt
+#
+# We should have added a new machine:
+# CHECK-SPLITMACHINE: Imported Data
+# CHECK-SPLITMACHINE: -------------
+# CHECK-SPLITMACHINE: Added Machines: 1
+# CHECK-SPLITMACHINE: Added Runs : 1
+#
+# CHECK-SPLITMACHINE: Results
+# CHECK-SPLITMACHINE: ----------------
+# CHECK-SPLITMACHINE: PASS : 5
+# CHECK-SPLITMACHINE: Results available at: http://localhost:9091/db_default/v4/compile/9
Modified: lnt/trunk/tests/server/db/search.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/server/db/search.py?rev=312672&r1=312671&r2=312672&view=diff
==============================================================================
--- lnt/trunk/tests/server/db/search.py (original)
+++ lnt/trunk/tests/server/db/search.py Wed Sep 6 14:57:03 2017
@@ -46,7 +46,7 @@ class SearchTest(unittest.TestCase):
None, 'default', self.db, self.session, f.name,
format='<auto>', ts_name='nts', show_sample_count=False,
disable_email=True, disable_report=True,
- updateMachine=False, mergeRun='reject')
+ select_machine='match', merge_run='reject')
assert result.get('success', False)
More information about the llvm-commits
mailing list