Print this page
9600 LDT still not happy under KPTI

Split Close
Expand all
Collapse all
          --- old/usr/src/test/test-runner/cmd/run
          +++ new/usr/src/test/test-runner/cmd/run
↓ open down ↓ 6 lines elided ↑ open up ↑
   7    7  # 1.0 of the CDDL.
   8    8  #
   9    9  # A full copy of the text of the CDDL should have accompanied this
  10   10  # source.  A copy of the CDDL is also available via the Internet at
  11   11  # http://www.illumos.org/license/CDDL.
  12   12  #
  13   13  
  14   14  #
  15   15  # Copyright (c) 2012, 2016 by Delphix. All rights reserved.
  16   16  # Copyright (c) 2017, Chris Fraire <cfraire@me.com>.
       17 +# Copyright 2018 Joyent, Inc.
  17   18  #
  18   19  
  19   20  import ConfigParser
  20   21  import os
  21   22  import logging
       23 +import platform
  22   24  from logging.handlers import WatchedFileHandler
  23   25  from datetime import datetime
  24   26  from optparse import OptionParser
  25   27  from pwd import getpwnam
  26   28  from pwd import getpwuid
  27   29  from select import select
  28   30  from subprocess import PIPE
  29   31  from subprocess import Popen
  30   32  from sys import argv
  31   33  from sys import maxint
↓ open down ↓ 525 lines elided ↑ open up ↑
 557  559          config = ConfigParser.RawConfigParser()
 558  560          if not len(config.read(options.runfile)):
 559  561              fail("Coulnd't read config file %s" % options.runfile)
 560  562  
 561  563          for opt in TestRun.props:
 562  564              if config.has_option('DEFAULT', opt):
 563  565                  setattr(self, opt, config.get('DEFAULT', opt))
 564  566          self.outputdir = os.path.join(self.outputdir, self.timestamp)
 565  567  
 566  568          for section in config.sections():
      569 +            if ('arch' in config.options(section) and
      570 +                platform.machine() != config.get(section, 'arch')):
      571 +                continue
      572 +
 567  573              if 'tests' in config.options(section):
 568  574                  testgroup = TestGroup(section)
 569  575                  for prop in TestGroup.props:
 570  576                      for sect in ['DEFAULT', section]:
 571  577                          if config.has_option(sect, prop):
 572  578                              setattr(testgroup, prop, config.get(sect, prop))
 573  579  
 574  580                  # Repopulate tests using eval to convert the string to a list
 575  581                  testgroup.tests = eval(config.get(section, 'tests'))
 576  582  
↓ open down ↓ 310 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX