License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 21:07:57 +07:00
|
|
|
# SPDX-License-Identifier: GPL-2.0
|
2012-10-31 21:52:47 +07:00
|
|
|
|
2019-01-24 07:52:29 +07:00
|
|
|
from __future__ import print_function
|
|
|
|
|
2012-10-31 21:52:47 +07:00
|
|
|
import os
|
|
|
|
import sys
|
|
|
|
import glob
|
|
|
|
import optparse
|
|
|
|
import tempfile
|
|
|
|
import logging
|
|
|
|
import shutil
|
2019-01-24 07:52:29 +07:00
|
|
|
|
|
|
|
try:
|
|
|
|
import configparser
|
|
|
|
except ImportError:
|
|
|
|
import ConfigParser as configparser
|
2012-10-31 21:52:47 +07:00
|
|
|
|
2017-07-03 21:50:20 +07:00
|
|
|
def data_equal(a, b):
|
2017-07-03 21:50:19 +07:00
|
|
|
# Allow multiple values in assignment separated by '|'
|
|
|
|
a_list = a.split('|')
|
|
|
|
b_list = b.split('|')
|
|
|
|
|
|
|
|
for a_item in a_list:
|
|
|
|
for b_item in b_list:
|
|
|
|
if (a_item == b_item):
|
|
|
|
return True
|
|
|
|
elif (a_item == '*') or (b_item == '*'):
|
|
|
|
return True
|
|
|
|
|
|
|
|
return False
|
|
|
|
|
2012-10-31 21:52:47 +07:00
|
|
|
class Fail(Exception):
|
|
|
|
def __init__(self, test, msg):
|
|
|
|
self.msg = msg
|
|
|
|
self.test = test
|
|
|
|
def getMsg(self):
|
|
|
|
return '\'%s\' - %s' % (self.test.path, self.msg)
|
|
|
|
|
2017-06-22 14:36:25 +07:00
|
|
|
class Notest(Exception):
|
|
|
|
def __init__(self, test, arch):
|
|
|
|
self.arch = arch
|
|
|
|
self.test = test
|
|
|
|
def getMsg(self):
|
|
|
|
return '[%s] \'%s\'' % (self.arch, self.test.path)
|
|
|
|
|
2012-10-31 21:52:47 +07:00
|
|
|
class Unsup(Exception):
|
|
|
|
def __init__(self, test):
|
|
|
|
self.test = test
|
|
|
|
def getMsg(self):
|
|
|
|
return '\'%s\'' % self.test.path
|
|
|
|
|
|
|
|
class Event(dict):
|
|
|
|
terms = [
|
2013-02-25 16:52:50 +07:00
|
|
|
'cpu',
|
2012-10-31 21:52:47 +07:00
|
|
|
'flags',
|
|
|
|
'type',
|
|
|
|
'size',
|
|
|
|
'config',
|
|
|
|
'sample_period',
|
|
|
|
'sample_type',
|
|
|
|
'read_format',
|
|
|
|
'disabled',
|
|
|
|
'inherit',
|
|
|
|
'pinned',
|
|
|
|
'exclusive',
|
|
|
|
'exclude_user',
|
|
|
|
'exclude_kernel',
|
|
|
|
'exclude_hv',
|
|
|
|
'exclude_idle',
|
|
|
|
'mmap',
|
|
|
|
'comm',
|
|
|
|
'freq',
|
|
|
|
'inherit_stat',
|
|
|
|
'enable_on_exec',
|
|
|
|
'task',
|
2012-11-05 22:49:38 +07:00
|
|
|
'watermark',
|
2012-10-31 21:52:47 +07:00
|
|
|
'precise_ip',
|
|
|
|
'mmap_data',
|
|
|
|
'sample_id_all',
|
|
|
|
'exclude_host',
|
|
|
|
'exclude_guest',
|
|
|
|
'exclude_callchain_kernel',
|
|
|
|
'exclude_callchain_user',
|
|
|
|
'wakeup_events',
|
|
|
|
'bp_type',
|
|
|
|
'config1',
|
|
|
|
'config2',
|
|
|
|
'branch_sample_type',
|
|
|
|
'sample_regs_user',
|
|
|
|
'sample_stack_user',
|
|
|
|
]
|
|
|
|
|
|
|
|
def add(self, data):
|
|
|
|
for key, val in data:
|
|
|
|
log.debug(" %s = %s" % (key, val))
|
|
|
|
self[key] = val
|
|
|
|
|
|
|
|
def __init__(self, name, data, base):
|
2012-12-19 00:14:24 +07:00
|
|
|
log.debug(" Event %s" % name);
|
2012-10-31 21:52:47 +07:00
|
|
|
self.name = name;
|
|
|
|
self.group = ''
|
|
|
|
self.add(base)
|
|
|
|
self.add(data)
|
|
|
|
|
|
|
|
def equal(self, other):
|
|
|
|
for t in Event.terms:
|
|
|
|
log.debug(" [%s] %s %s" % (t, self[t], other[t]));
|
2019-01-24 07:52:29 +07:00
|
|
|
if t not in self or t not in other:
|
2012-10-31 21:52:47 +07:00
|
|
|
return False
|
2017-07-03 21:50:20 +07:00
|
|
|
if not data_equal(self[t], other[t]):
|
2012-10-31 21:52:47 +07:00
|
|
|
return False
|
|
|
|
return True
|
|
|
|
|
2017-07-03 21:50:29 +07:00
|
|
|
def optional(self):
|
2019-01-24 07:52:29 +07:00
|
|
|
if 'optional' in self and self['optional'] == '1':
|
2017-07-03 21:50:29 +07:00
|
|
|
return True
|
|
|
|
return False
|
|
|
|
|
2012-12-19 00:14:24 +07:00
|
|
|
def diff(self, other):
|
|
|
|
for t in Event.terms:
|
2019-01-24 07:52:29 +07:00
|
|
|
if t not in self or t not in other:
|
2012-12-19 00:14:24 +07:00
|
|
|
continue
|
2017-07-03 21:50:20 +07:00
|
|
|
if not data_equal(self[t], other[t]):
|
2018-11-22 21:04:56 +07:00
|
|
|
log.warning("expected %s=%s, got %s" % (t, self[t], other[t]))
|
2012-12-19 00:14:24 +07:00
|
|
|
|
2012-11-05 22:49:39 +07:00
|
|
|
# Test file description needs to have following sections:
|
|
|
|
# [config]
|
|
|
|
# - just single instance in file
|
|
|
|
# - needs to specify:
|
|
|
|
# 'command' - perf command name
|
|
|
|
# 'args' - special command arguments
|
|
|
|
# 'ret' - expected command return value (0 by default)
|
2017-06-22 14:36:25 +07:00
|
|
|
# 'arch' - architecture specific test (optional)
|
|
|
|
# comma separated list, ! at the beginning
|
|
|
|
# negates it.
|
2012-11-05 22:49:39 +07:00
|
|
|
#
|
|
|
|
# [eventX:base]
|
|
|
|
# - one or multiple instances in file
|
|
|
|
# - expected values assignments
|
2012-10-31 21:52:47 +07:00
|
|
|
class Test(object):
|
|
|
|
def __init__(self, path, options):
|
2019-01-24 07:52:29 +07:00
|
|
|
parser = configparser.SafeConfigParser()
|
2012-10-31 21:52:47 +07:00
|
|
|
parser.read(path)
|
|
|
|
|
2013-02-25 16:52:49 +07:00
|
|
|
log.warning("running '%s'" % path)
|
2012-10-31 21:52:47 +07:00
|
|
|
|
|
|
|
self.path = path
|
|
|
|
self.test_dir = options.test_dir
|
|
|
|
self.perf = options.perf
|
|
|
|
self.command = parser.get('config', 'command')
|
|
|
|
self.args = parser.get('config', 'args')
|
|
|
|
|
|
|
|
try:
|
|
|
|
self.ret = parser.get('config', 'ret')
|
|
|
|
except:
|
|
|
|
self.ret = 0
|
|
|
|
|
2017-06-22 14:36:25 +07:00
|
|
|
try:
|
|
|
|
self.arch = parser.get('config', 'arch')
|
|
|
|
log.warning("test limitation '%s'" % self.arch)
|
|
|
|
except:
|
|
|
|
self.arch = ''
|
|
|
|
|
2012-10-31 21:52:47 +07:00
|
|
|
self.expect = {}
|
|
|
|
self.result = {}
|
2012-12-19 00:14:24 +07:00
|
|
|
log.debug(" loading expected events");
|
2012-10-31 21:52:47 +07:00
|
|
|
self.load_events(path, self.expect)
|
|
|
|
|
|
|
|
def is_event(self, name):
|
|
|
|
if name.find("event") == -1:
|
|
|
|
return False
|
|
|
|
else:
|
|
|
|
return True
|
|
|
|
|
2017-06-22 14:36:25 +07:00
|
|
|
def skip_test(self, myarch):
|
|
|
|
# If architecture not set always run test
|
|
|
|
if self.arch == '':
|
|
|
|
# log.warning("test for arch %s is ok" % myarch)
|
|
|
|
return False
|
|
|
|
|
|
|
|
# Allow multiple values in assignment separated by ','
|
|
|
|
arch_list = self.arch.split(',')
|
|
|
|
|
|
|
|
# Handle negated list such as !s390x,ppc
|
|
|
|
if arch_list[0][0] == '!':
|
|
|
|
arch_list[0] = arch_list[0][1:]
|
|
|
|
log.warning("excluded architecture list %s" % arch_list)
|
|
|
|
for arch_item in arch_list:
|
|
|
|
# log.warning("test for %s arch is %s" % (arch_item, myarch))
|
|
|
|
if arch_item == myarch:
|
|
|
|
return True
|
|
|
|
return False
|
|
|
|
|
|
|
|
for arch_item in arch_list:
|
|
|
|
# log.warning("test for architecture '%s' current '%s'" % (arch_item, myarch))
|
|
|
|
if arch_item == myarch:
|
|
|
|
return False
|
|
|
|
return True
|
|
|
|
|
2012-10-31 21:52:47 +07:00
|
|
|
def load_events(self, path, events):
|
2019-01-24 07:52:29 +07:00
|
|
|
parser_event = configparser.SafeConfigParser()
|
2012-10-31 21:52:47 +07:00
|
|
|
parser_event.read(path)
|
|
|
|
|
2012-11-05 22:49:39 +07:00
|
|
|
# The event record section header contains 'event' word,
|
|
|
|
# optionaly followed by ':' allowing to load 'parent
|
|
|
|
# event' first as a base
|
2012-10-31 21:52:47 +07:00
|
|
|
for section in filter(self.is_event, parser_event.sections()):
|
|
|
|
|
|
|
|
parser_items = parser_event.items(section);
|
|
|
|
base_items = {}
|
|
|
|
|
2012-11-05 22:49:39 +07:00
|
|
|
# Read parent event if there's any
|
2012-10-31 21:52:47 +07:00
|
|
|
if (':' in section):
|
|
|
|
base = section[section.index(':') + 1:]
|
2019-01-24 07:52:29 +07:00
|
|
|
parser_base = configparser.SafeConfigParser()
|
2012-10-31 21:52:47 +07:00
|
|
|
parser_base.read(self.test_dir + '/' + base)
|
|
|
|
base_items = parser_base.items('event')
|
|
|
|
|
|
|
|
e = Event(section, parser_items, base_items)
|
|
|
|
events[section] = e
|
|
|
|
|
|
|
|
def run_cmd(self, tempdir):
|
2017-06-22 14:36:25 +07:00
|
|
|
junk1, junk2, junk3, junk4, myarch = (os.uname())
|
|
|
|
|
|
|
|
if self.skip_test(myarch):
|
|
|
|
raise Notest(self, myarch)
|
|
|
|
|
2012-10-31 21:52:47 +07:00
|
|
|
cmd = "PERF_TEST_ATTR=%s %s %s -o %s/perf.data %s" % (tempdir,
|
|
|
|
self.perf, self.command, tempdir, self.args)
|
|
|
|
ret = os.WEXITSTATUS(os.system(cmd))
|
|
|
|
|
2017-07-03 21:50:19 +07:00
|
|
|
log.info(" '%s' ret '%s', expected '%s'" % (cmd, str(ret), str(self.ret)))
|
2012-10-31 21:52:47 +07:00
|
|
|
|
2017-07-03 21:50:20 +07:00
|
|
|
if not data_equal(str(ret), str(self.ret)):
|
2012-10-31 21:52:47 +07:00
|
|
|
raise Unsup(self)
|
|
|
|
|
|
|
|
def compare(self, expect, result):
|
|
|
|
match = {}
|
|
|
|
|
2012-12-19 00:14:24 +07:00
|
|
|
log.debug(" compare");
|
2012-10-31 21:52:47 +07:00
|
|
|
|
|
|
|
# For each expected event find all matching
|
|
|
|
# events in result. Fail if there's not any.
|
|
|
|
for exp_name, exp_event in expect.items():
|
|
|
|
exp_list = []
|
perf test attr: Fix python error on empty result
Commit d78ada4a767 ("perf tests attr: Do not store failed events") does
not create an event file in the /tmp directory when the
perf_open_event() system call failed.
This can lead to a situation where not /tmp/event-xx-yy-zz result file
exists at all (for example on a s390x virtual machine environment) where
no CPUMF hardware is available.
The following command then fails with a python call back chain instead
of printing failure:
[root@s8360046 perf]# /usr/bin/python2 ./tests/attr.py -d ./tests/attr/ \
-p ./perf -v -ttest-stat-basic
running './tests/attr//test-stat-basic'
Traceback (most recent call last):
File "./tests/attr.py", line 379, in <module>
main()
File "./tests/attr.py", line 370, in main
run_tests(options)
File "./tests/attr.py", line 311, in run_tests
Test(f, options).run()
File "./tests/attr.py", line 300, in run
self.compare(self.expect, self.result)
File "./tests/attr.py", line 248, in compare
exp_event.diff(res_event)
UnboundLocalError: local variable 'res_event' referenced before assignment
[root@s8360046 perf]#
This patch catches this pitfall and prints an error message instead:
[root@s8360047 perf]# /usr/bin/python2 ./tests/attr.py -d ./tests/attr/ \
-p ./perf -vvv -ttest-stat-basic
running './tests/attr//test-stat-basic'
loading expected events
Event event:base-stat
fd = 1
group_fd = -1
flags = 0|8
[....]
sample_regs_user = 0
sample_stack_user = 0
'PERF_TEST_ATTR=/tmp/tmpJbMQMP ./perf stat -o /tmp/tmpJbMQMP/perf.data -e cycles kill >/dev/null 2>&1' ret '1', expected '1'
loading result events
compare
matching [event:base-stat]
match: [event:base-stat] matches []
res_event is empty
FAILED './tests/attr//test-stat-basic' - match failure
[root@s8360047 perf]#
Signed-off-by: Thomas-Mich Richter <tmricht@linux.vnet.ibm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Thomas-Mich Richter <tmricht@linux.vnet.ibm.com>
LPU-Reference: 20170913081209.39570-1-tmricht@linux.vnet.ibm.com
Link: http://lkml.kernel.org/n/tip-04d63nn7svfgxdhi60gq2mlm@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2017-09-13 15:12:08 +07:00
|
|
|
res_event = {}
|
2012-10-31 21:52:47 +07:00
|
|
|
log.debug(" matching [%s]" % exp_name)
|
|
|
|
for res_name, res_event in result.items():
|
|
|
|
log.debug(" to [%s]" % res_name)
|
|
|
|
if (exp_event.equal(res_event)):
|
|
|
|
exp_list.append(res_name)
|
|
|
|
log.debug(" ->OK")
|
|
|
|
else:
|
|
|
|
log.debug(" ->FAIL");
|
|
|
|
|
2012-12-19 00:14:24 +07:00
|
|
|
log.debug(" match: [%s] matches %s" % (exp_name, str(exp_list)))
|
2012-10-31 21:52:47 +07:00
|
|
|
|
|
|
|
# we did not any matching event - fail
|
2017-07-03 21:50:29 +07:00
|
|
|
if not exp_list:
|
|
|
|
if exp_event.optional():
|
|
|
|
log.debug(" %s does not match, but is optional" % exp_name)
|
|
|
|
else:
|
perf test attr: Fix python error on empty result
Commit d78ada4a767 ("perf tests attr: Do not store failed events") does
not create an event file in the /tmp directory when the
perf_open_event() system call failed.
This can lead to a situation where not /tmp/event-xx-yy-zz result file
exists at all (for example on a s390x virtual machine environment) where
no CPUMF hardware is available.
The following command then fails with a python call back chain instead
of printing failure:
[root@s8360046 perf]# /usr/bin/python2 ./tests/attr.py -d ./tests/attr/ \
-p ./perf -v -ttest-stat-basic
running './tests/attr//test-stat-basic'
Traceback (most recent call last):
File "./tests/attr.py", line 379, in <module>
main()
File "./tests/attr.py", line 370, in main
run_tests(options)
File "./tests/attr.py", line 311, in run_tests
Test(f, options).run()
File "./tests/attr.py", line 300, in run
self.compare(self.expect, self.result)
File "./tests/attr.py", line 248, in compare
exp_event.diff(res_event)
UnboundLocalError: local variable 'res_event' referenced before assignment
[root@s8360046 perf]#
This patch catches this pitfall and prints an error message instead:
[root@s8360047 perf]# /usr/bin/python2 ./tests/attr.py -d ./tests/attr/ \
-p ./perf -vvv -ttest-stat-basic
running './tests/attr//test-stat-basic'
loading expected events
Event event:base-stat
fd = 1
group_fd = -1
flags = 0|8
[....]
sample_regs_user = 0
sample_stack_user = 0
'PERF_TEST_ATTR=/tmp/tmpJbMQMP ./perf stat -o /tmp/tmpJbMQMP/perf.data -e cycles kill >/dev/null 2>&1' ret '1', expected '1'
loading result events
compare
matching [event:base-stat]
match: [event:base-stat] matches []
res_event is empty
FAILED './tests/attr//test-stat-basic' - match failure
[root@s8360047 perf]#
Signed-off-by: Thomas-Mich Richter <tmricht@linux.vnet.ibm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Thomas-Mich Richter <tmricht@linux.vnet.ibm.com>
LPU-Reference: 20170913081209.39570-1-tmricht@linux.vnet.ibm.com
Link: http://lkml.kernel.org/n/tip-04d63nn7svfgxdhi60gq2mlm@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2017-09-13 15:12:08 +07:00
|
|
|
if not res_event:
|
|
|
|
log.debug(" res_event is empty");
|
|
|
|
else:
|
|
|
|
exp_event.diff(res_event)
|
2017-07-03 21:50:29 +07:00
|
|
|
raise Fail(self, 'match failure');
|
2012-10-31 21:52:47 +07:00
|
|
|
|
|
|
|
match[exp_name] = exp_list
|
|
|
|
|
|
|
|
# For each defined group in the expected events
|
|
|
|
# check we match the same group in the result.
|
|
|
|
for exp_name, exp_event in expect.items():
|
|
|
|
group = exp_event.group
|
|
|
|
|
|
|
|
if (group == ''):
|
|
|
|
continue
|
|
|
|
|
|
|
|
for res_name in match[exp_name]:
|
|
|
|
res_group = result[res_name].group
|
|
|
|
if res_group not in match[group]:
|
|
|
|
raise Fail(self, 'group failure')
|
|
|
|
|
2012-12-19 00:14:24 +07:00
|
|
|
log.debug(" group: [%s] matches group leader %s" %
|
2012-10-31 21:52:47 +07:00
|
|
|
(exp_name, str(match[group])))
|
|
|
|
|
2012-12-19 00:14:24 +07:00
|
|
|
log.debug(" matched")
|
2012-10-31 21:52:47 +07:00
|
|
|
|
|
|
|
def resolve_groups(self, events):
|
|
|
|
for name, event in events.items():
|
|
|
|
group_fd = event['group_fd'];
|
|
|
|
if group_fd == '-1':
|
|
|
|
continue;
|
|
|
|
|
|
|
|
for iname, ievent in events.items():
|
|
|
|
if (ievent['fd'] == group_fd):
|
|
|
|
event.group = iname
|
|
|
|
log.debug('[%s] has group leader [%s]' % (name, iname))
|
|
|
|
break;
|
|
|
|
|
|
|
|
def run(self):
|
|
|
|
tempdir = tempfile.mkdtemp();
|
|
|
|
|
2012-11-08 23:01:01 +07:00
|
|
|
try:
|
|
|
|
# run the test script
|
|
|
|
self.run_cmd(tempdir);
|
2012-10-31 21:52:47 +07:00
|
|
|
|
2012-11-08 23:01:01 +07:00
|
|
|
# load events expectation for the test
|
2012-12-19 00:14:24 +07:00
|
|
|
log.debug(" loading result events");
|
2012-11-08 23:01:01 +07:00
|
|
|
for f in glob.glob(tempdir + '/event*'):
|
|
|
|
self.load_events(f, self.result);
|
2012-10-31 21:52:47 +07:00
|
|
|
|
2012-11-08 23:01:01 +07:00
|
|
|
# resolve group_fd to event names
|
|
|
|
self.resolve_groups(self.expect);
|
|
|
|
self.resolve_groups(self.result);
|
2012-10-31 21:52:47 +07:00
|
|
|
|
2012-11-08 23:01:01 +07:00
|
|
|
# do the expectation - results matching - both ways
|
|
|
|
self.compare(self.expect, self.result)
|
|
|
|
self.compare(self.result, self.expect)
|
2012-10-31 21:52:47 +07:00
|
|
|
|
2012-11-08 23:01:01 +07:00
|
|
|
finally:
|
|
|
|
# cleanup
|
|
|
|
shutil.rmtree(tempdir)
|
2012-10-31 21:52:47 +07:00
|
|
|
|
|
|
|
|
|
|
|
def run_tests(options):
|
|
|
|
for f in glob.glob(options.test_dir + '/' + options.test):
|
|
|
|
try:
|
|
|
|
Test(f, options).run()
|
2019-01-24 07:52:29 +07:00
|
|
|
except Unsup as obj:
|
2012-10-31 21:52:47 +07:00
|
|
|
log.warning("unsupp %s" % obj.getMsg())
|
2019-01-24 07:52:29 +07:00
|
|
|
except Notest as obj:
|
2017-06-22 14:36:25 +07:00
|
|
|
log.warning("skipped %s" % obj.getMsg())
|
2012-10-31 21:52:47 +07:00
|
|
|
|
|
|
|
def setup_log(verbose):
|
|
|
|
global log
|
|
|
|
level = logging.CRITICAL
|
|
|
|
|
|
|
|
if verbose == 1:
|
|
|
|
level = logging.WARNING
|
|
|
|
if verbose == 2:
|
|
|
|
level = logging.INFO
|
|
|
|
if verbose >= 3:
|
|
|
|
level = logging.DEBUG
|
|
|
|
|
|
|
|
log = logging.getLogger('test')
|
|
|
|
log.setLevel(level)
|
|
|
|
ch = logging.StreamHandler()
|
|
|
|
ch.setLevel(level)
|
|
|
|
formatter = logging.Formatter('%(message)s')
|
|
|
|
ch.setFormatter(formatter)
|
|
|
|
log.addHandler(ch)
|
|
|
|
|
|
|
|
USAGE = '''%s [OPTIONS]
|
|
|
|
-d dir # tests dir
|
|
|
|
-p path # perf binary
|
|
|
|
-t test # single test
|
|
|
|
-v # verbose level
|
|
|
|
''' % sys.argv[0]
|
|
|
|
|
|
|
|
def main():
|
|
|
|
parser = optparse.OptionParser(usage=USAGE)
|
|
|
|
|
|
|
|
parser.add_option("-t", "--test",
|
|
|
|
action="store", type="string", dest="test")
|
|
|
|
parser.add_option("-d", "--test-dir",
|
|
|
|
action="store", type="string", dest="test_dir")
|
|
|
|
parser.add_option("-p", "--perf",
|
|
|
|
action="store", type="string", dest="perf")
|
|
|
|
parser.add_option("-v", "--verbose",
|
2019-01-24 07:52:29 +07:00
|
|
|
default=0, action="count", dest="verbose")
|
2012-10-31 21:52:47 +07:00
|
|
|
|
|
|
|
options, args = parser.parse_args()
|
|
|
|
if args:
|
|
|
|
parser.error('FAILED wrong arguments %s' % ' '.join(args))
|
|
|
|
return -1
|
|
|
|
|
|
|
|
setup_log(options.verbose)
|
|
|
|
|
|
|
|
if not options.test_dir:
|
2019-01-24 07:52:29 +07:00
|
|
|
print('FAILED no -d option specified')
|
2012-10-31 21:52:47 +07:00
|
|
|
sys.exit(-1)
|
|
|
|
|
|
|
|
if not options.test:
|
|
|
|
options.test = 'test*'
|
|
|
|
|
|
|
|
try:
|
|
|
|
run_tests(options)
|
|
|
|
|
2019-01-24 07:52:29 +07:00
|
|
|
except Fail as obj:
|
|
|
|
print("FAILED %s" % obj.getMsg())
|
2012-10-31 21:52:47 +07:00
|
|
|
sys.exit(-1)
|
|
|
|
|
|
|
|
sys.exit(0)
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
|
|
main()
|