[LNT] r349589 - fatal was not imported, and fix formatting
Chris Matthews via llvm-commits
llvm-commits at lists.llvm.org
Tue Dec 18 16:20:36 PST 2018
Author: cmatthews
Date: Tue Dec 18 16:20:36 2018
New Revision: 349589
URL: http://llvm.org/viewvc/llvm-project?rev=349589&view=rev
Log:
fatal was not imported, and fix formatting
Modified:
lnt/trunk/lnt/testing/util/machineinfo.py
Modified: lnt/trunk/lnt/testing/util/machineinfo.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/testing/util/machineinfo.py?rev=349589&r1=349588&r2=349589&view=diff
==============================================================================
--- lnt/trunk/lnt/testing/util/machineinfo.py (original)
+++ lnt/trunk/lnt/testing/util/machineinfo.py Tue Dec 18 16:20:36 2018
@@ -5,7 +5,7 @@ results.
import re
-from lnt.testing.util.commands import capture
+from lnt.testing.util.commands import capture, fatal
# All the things we care to probe about the system, and whether to track with
# the machine or run. This is a list of (sysctl, kind) where kind is one of:
@@ -13,134 +13,134 @@ from lnt.testing.util.commands import ca
# machdep - key should be part of machine, unless --no-machdep-info is set
# run - key should always be part of run
sysctl_info_table = [
- ('hw.activecpu', 'machine'),
- ('hw.availcpu', 'machine'),
- ('hw.busfrequency', 'machine'),
- ('hw.busfrequency_max', 'machine'),
- ('hw.busfrequency_min', 'machine'),
- ('hw.byteorder', 'machine'),
- ('hw.cacheconfig', 'machine'),
- ('hw.cachelinesize', 'machine'),
- ('hw.cachesize', 'machine'),
- ('hw.cpu64bit_capable', 'machine'),
- ('hw.cpufamily', 'machine'),
- ('hw.cpufrequency', 'machine'),
- ('hw.cpufrequency_max', 'machine'),
- ('hw.cpufrequency_min', 'machine'),
- ('hw.cpusubtype', 'machine'),
- ('hw.cputype', 'machine'),
- ('hw.epoch', 'machine'),
- ('hw.l1dcachesize', 'machine'),
- ('hw.l1icachesize', 'machine'),
- ('hw.l2cachesize', 'machine'),
- ('hw.l2settings', 'machine'),
- ('hw.logicalcpu', 'machine'),
- ('hw.logicalcpu_max', 'machine'),
- ('hw.machine', 'machine'),
- ('hw.memsize', 'machine'),
- ('hw.model', 'machine'),
- ('hw.ncpu', 'machine'),
- ('hw.optional.floatingpoint', 'machine'),
- ('hw.optional.mmx', 'machine'),
- ('hw.optional.sse', 'machine'),
- ('hw.optional.sse2', 'machine'),
- ('hw.optional.sse3', 'machine'),
- ('hw.optional.sse4_1', 'machine'),
- ('hw.optional.sse4_2', 'machine'),
- ('hw.optional.supplementalsse3', 'machine'),
- ('hw.optional.x86_64', 'machine'),
- ('hw.packages', 'machine'),
- ('hw.pagesize', 'machine'),
- ('hw.physicalcpu', 'machine'),
- ('hw.physicalcpu_max', 'machine'),
- ('hw.physmem', 'machine'),
- ('hw.tbfrequency', 'machine'),
- ('hw.usermem', 'run'),
- ('hw.vectorunit', 'machine'),
- ('kern.aiomax', 'machine'),
- ('kern.aioprocmax', 'machine'),
- ('kern.aiothreads', 'machine'),
- ('kern.argmax', 'machine'),
- ('kern.boottime', 'run'),
- ('kern.clockrate: hz', 'machine'),
- ('kern.coredump', 'machine'),
- ('kern.corefile', 'machine'),
- ('kern.delayterm', 'machine'),
- ('kern.hostid', 'machine'),
- ('kern.hostname', 'machdep'),
- ('kern.job_control', 'machine'),
- ('kern.maxfiles', 'machine'),
- ('kern.maxfilesperproc', 'machine'),
- ('kern.maxproc', 'machine'),
- ('kern.maxprocperuid', 'machine'),
- ('kern.maxvnodes', 'machine'),
- ('kern.netboot', 'machine'),
- ('kern.ngroups', 'machine'),
- ('kern.nisdomainname', 'machine'),
- ('kern.nx', 'machine'),
- ('kern.osrelease', 'machine'),
- ('kern.osrevision', 'machine'),
- ('kern.ostype', 'machine'),
- ('kern.osversion', 'machine'),
- ('kern.posix1version', 'machine'),
- ('kern.procname', 'machine'),
- ('kern.rage_vnode', 'machine'),
- ('kern.safeboot', 'machine'),
- ('kern.saved_ids', 'machine'),
- ('kern.securelevel', 'machine'),
- ('kern.shreg_private', 'machine'),
- ('kern.speculative_reads_disabled', 'machine'),
- ('kern.sugid_coredump', 'machine'),
- ('kern.thread_name', 'machine'),
- ('kern.usrstack', 'run'),
- ('kern.usrstack64', 'run'),
- ('kern.version', 'machine'),
- ('machdep.cpu.address_bits.physical', 'machine'),
- ('machdep.cpu.address_bits.virtual', 'machine'),
- ('machdep.cpu.arch_perf.events', 'machine'),
- ('machdep.cpu.arch_perf.events_number', 'machine'),
- ('machdep.cpu.arch_perf.fixed_number', 'machine'),
- ('machdep.cpu.arch_perf.fixed_width', 'machine'),
- ('machdep.cpu.arch_perf.number', 'machine'),
- ('machdep.cpu.arch_perf.version', 'machine'),
- ('machdep.cpu.arch_perf.width', 'machine'),
- ('machdep.cpu.brand', 'machine'),
- ('machdep.cpu.brand_string', 'machine'),
- ('machdep.cpu.cache.L2_associativity', 'machine'),
- ('machdep.cpu.cache.linesize', 'machine'),
- ('machdep.cpu.cache.size', 'machine'),
- ('machdep.cpu.core_count', 'machine'),
- ('machdep.cpu.cores_per_package', 'machine'),
- ('machdep.cpu.extfamily', 'machine'),
- ('machdep.cpu.extfeature_bits', 'machine'),
- ('machdep.cpu.extfeatures', 'machine'),
- ('machdep.cpu.extmodel', 'machine'),
- ('machdep.cpu.family', 'machine'),
- ('machdep.cpu.feature_bits', 'machine'),
- ('machdep.cpu.features', 'machine'),
- ('machdep.cpu.logical_per_package', 'machine'),
- ('machdep.cpu.max_basic', 'machine'),
- ('machdep.cpu.max_ext', 'machine'),
- ('machdep.cpu.microcode_version', 'machine'),
- ('machdep.cpu.model', 'machine'),
- ('machdep.cpu.mwait.extensions', 'machine'),
- ('machdep.cpu.mwait.linesize_max', 'machine'),
- ('machdep.cpu.mwait.linesize_min', 'machine'),
- ('machdep.cpu.mwait.sub_Cstates', 'machine'),
- ('machdep.cpu.signature', 'machine'),
- ('machdep.cpu.stepping', 'machine'),
- ('machdep.cpu.thermal.ACNT_MCNT', 'machine'),
- ('machdep.cpu.thermal.dynamic_acceleration', 'machine'),
- ('machdep.cpu.thermal.sensor', 'machine'),
- ('machdep.cpu.thermal.thresholds', 'machine'),
- ('machdep.cpu.thread_count', 'machine'),
- ('machdep.cpu.tlb.data.large', 'machine'),
- ('machdep.cpu.tlb.data.large_level1', 'machine'),
- ('machdep.cpu.tlb.data.small', 'machine'),
- ('machdep.cpu.tlb.data.small_level1', 'machine'),
- ('machdep.cpu.tlb.inst.large', 'machine'),
- ('machdep.cpu.tlb.inst.small', 'machine'),
- ('machdep.cpu.vendor', 'machine'),
+ ('hw.activecpu', 'machine'),
+ ('hw.availcpu', 'machine'),
+ ('hw.busfrequency', 'machine'),
+ ('hw.busfrequency_max', 'machine'),
+ ('hw.busfrequency_min', 'machine'),
+ ('hw.byteorder', 'machine'),
+ ('hw.cacheconfig', 'machine'),
+ ('hw.cachelinesize', 'machine'),
+ ('hw.cachesize', 'machine'),
+ ('hw.cpu64bit_capable', 'machine'),
+ ('hw.cpufamily', 'machine'),
+ ('hw.cpufrequency', 'machine'),
+ ('hw.cpufrequency_max', 'machine'),
+ ('hw.cpufrequency_min', 'machine'),
+ ('hw.cpusubtype', 'machine'),
+ ('hw.cputype', 'machine'),
+ ('hw.epoch', 'machine'),
+ ('hw.l1dcachesize', 'machine'),
+ ('hw.l1icachesize', 'machine'),
+ ('hw.l2cachesize', 'machine'),
+ ('hw.l2settings', 'machine'),
+ ('hw.logicalcpu', 'machine'),
+ ('hw.logicalcpu_max', 'machine'),
+ ('hw.machine', 'machine'),
+ ('hw.memsize', 'machine'),
+ ('hw.model', 'machine'),
+ ('hw.ncpu', 'machine'),
+ ('hw.optional.floatingpoint', 'machine'),
+ ('hw.optional.mmx', 'machine'),
+ ('hw.optional.sse', 'machine'),
+ ('hw.optional.sse2', 'machine'),
+ ('hw.optional.sse3', 'machine'),
+ ('hw.optional.sse4_1', 'machine'),
+ ('hw.optional.sse4_2', 'machine'),
+ ('hw.optional.supplementalsse3', 'machine'),
+ ('hw.optional.x86_64', 'machine'),
+ ('hw.packages', 'machine'),
+ ('hw.pagesize', 'machine'),
+ ('hw.physicalcpu', 'machine'),
+ ('hw.physicalcpu_max', 'machine'),
+ ('hw.physmem', 'machine'),
+ ('hw.tbfrequency', 'machine'),
+ ('hw.usermem', 'run'),
+ ('hw.vectorunit', 'machine'),
+ ('kern.aiomax', 'machine'),
+ ('kern.aioprocmax', 'machine'),
+ ('kern.aiothreads', 'machine'),
+ ('kern.argmax', 'machine'),
+ ('kern.boottime', 'run'),
+ ('kern.clockrate: hz', 'machine'),
+ ('kern.coredump', 'machine'),
+ ('kern.corefile', 'machine'),
+ ('kern.delayterm', 'machine'),
+ ('kern.hostid', 'machine'),
+ ('kern.hostname', 'machdep'),
+ ('kern.job_control', 'machine'),
+ ('kern.maxfiles', 'machine'),
+ ('kern.maxfilesperproc', 'machine'),
+ ('kern.maxproc', 'machine'),
+ ('kern.maxprocperuid', 'machine'),
+ ('kern.maxvnodes', 'machine'),
+ ('kern.netboot', 'machine'),
+ ('kern.ngroups', 'machine'),
+ ('kern.nisdomainname', 'machine'),
+ ('kern.nx', 'machine'),
+ ('kern.osrelease', 'machine'),
+ ('kern.osrevision', 'machine'),
+ ('kern.ostype', 'machine'),
+ ('kern.osversion', 'machine'),
+ ('kern.posix1version', 'machine'),
+ ('kern.procname', 'machine'),
+ ('kern.rage_vnode', 'machine'),
+ ('kern.safeboot', 'machine'),
+ ('kern.saved_ids', 'machine'),
+ ('kern.securelevel', 'machine'),
+ ('kern.shreg_private', 'machine'),
+ ('kern.speculative_reads_disabled', 'machine'),
+ ('kern.sugid_coredump', 'machine'),
+ ('kern.thread_name', 'machine'),
+ ('kern.usrstack', 'run'),
+ ('kern.usrstack64', 'run'),
+ ('kern.version', 'machine'),
+ ('machdep.cpu.address_bits.physical', 'machine'),
+ ('machdep.cpu.address_bits.virtual', 'machine'),
+ ('machdep.cpu.arch_perf.events', 'machine'),
+ ('machdep.cpu.arch_perf.events_number', 'machine'),
+ ('machdep.cpu.arch_perf.fixed_number', 'machine'),
+ ('machdep.cpu.arch_perf.fixed_width', 'machine'),
+ ('machdep.cpu.arch_perf.number', 'machine'),
+ ('machdep.cpu.arch_perf.version', 'machine'),
+ ('machdep.cpu.arch_perf.width', 'machine'),
+ ('machdep.cpu.brand', 'machine'),
+ ('machdep.cpu.brand_string', 'machine'),
+ ('machdep.cpu.cache.L2_associativity', 'machine'),
+ ('machdep.cpu.cache.linesize', 'machine'),
+ ('machdep.cpu.cache.size', 'machine'),
+ ('machdep.cpu.core_count', 'machine'),
+ ('machdep.cpu.cores_per_package', 'machine'),
+ ('machdep.cpu.extfamily', 'machine'),
+ ('machdep.cpu.extfeature_bits', 'machine'),
+ ('machdep.cpu.extfeatures', 'machine'),
+ ('machdep.cpu.extmodel', 'machine'),
+ ('machdep.cpu.family', 'machine'),
+ ('machdep.cpu.feature_bits', 'machine'),
+ ('machdep.cpu.features', 'machine'),
+ ('machdep.cpu.logical_per_package', 'machine'),
+ ('machdep.cpu.max_basic', 'machine'),
+ ('machdep.cpu.max_ext', 'machine'),
+ ('machdep.cpu.microcode_version', 'machine'),
+ ('machdep.cpu.model', 'machine'),
+ ('machdep.cpu.mwait.extensions', 'machine'),
+ ('machdep.cpu.mwait.linesize_max', 'machine'),
+ ('machdep.cpu.mwait.linesize_min', 'machine'),
+ ('machdep.cpu.mwait.sub_Cstates', 'machine'),
+ ('machdep.cpu.signature', 'machine'),
+ ('machdep.cpu.stepping', 'machine'),
+ ('machdep.cpu.thermal.ACNT_MCNT', 'machine'),
+ ('machdep.cpu.thermal.dynamic_acceleration', 'machine'),
+ ('machdep.cpu.thermal.sensor', 'machine'),
+ ('machdep.cpu.thermal.thresholds', 'machine'),
+ ('machdep.cpu.thread_count', 'machine'),
+ ('machdep.cpu.tlb.data.large', 'machine'),
+ ('machdep.cpu.tlb.data.large_level1', 'machine'),
+ ('machdep.cpu.tlb.data.small', 'machine'),
+ ('machdep.cpu.tlb.data.small_level1', 'machine'),
+ ('machdep.cpu.tlb.inst.large', 'machine'),
+ ('machdep.cpu.tlb.inst.small', 'machine'),
+ ('machdep.cpu.vendor', 'machine'),
]
More information about the llvm-commits
mailing list