[LNT] Fix some ResourceWarnings

[thopre]

.gitignore

10

Is that what happens when installing LNT in develop mode? In any case, this should be in a separate patch.

11

Already covered by https://reviews.llvm.org/D94758

tests/runtest/test_suite-profile-import.py

23

Should be in a separate patch that fixes the other F811 error in lnt/server/reporting/analysis.py line 8

[danilaml]

.gitignore

10

Maybe? It's to ignore .so files from cPref.

[thopre]

.gitignore

10

The question is why there's a cPerf.so in there. It should be created where LNT is installed, except perhaps for the develop setup mode hence my question.

[danilaml]

.gitignore

10

Not sure. Could be due to develop mode. Could be due to some other issue. Anyway, it's not important. I've deleted it and it seems to still work. Just thought I might as well add it if I'm modifying .gitignore.

[thopre]

LGTM assuming tox is clean.

[danilaml]

Landed in https://github.com/llvm/llvm-lnt/commit/e736349f7cca1b18e93b6a12e222db0bafcf54f5

.gitignore

 *.pyc
 /LNT.egg-info
 build
 dist
 docs/_build
 lnt/server/ui/static/docs
 test_run_tmp
 tests/**/Output
 venv
+*.so
+.tox

lnt/server/db/rules/rule_update_profile_stats.py

def update_profile_stats(session, ts, run_id):
     history_path = os.path.join(config.profileDir, '_profile-history.json')
     age_path = os.path.join(config.profileDir, '_profile-age.json')
     profile_path = config.profileDir
 
     if not os.path.exists(profile_path):
         return
 
     try:
-        history = json.loads(open(history_path).read())
+        with open(history_path) as f:
+            history = json.loads(f.read())
     except Exception:
         history = []
     age = []
 
     dt = time.time()
     blocks = subprocess.check_output("du -s -k %s" % profile_path,
                                      shell=True,
                                      universal_newlines=True).split('\t')[0]
     kb = float(blocks)  # 1024 byte blocks.
 
     history.append((dt, kb))
 
     for f in glob.glob('%s/*.lntprof' % profile_path):
         mtime = os.stat(f).st_mtime
         sz = os.stat(f).st_size // 1000
         age.append([mtime, sz])
 
-    open(history_path, 'w').write(json.dumps(history))
-    open(age_path, 'w').write(json.dumps(age))
+    with open(history_path, 'w') as history_f:
+        history_f.write(json.dumps(history))
+    with open(age_path, 'w') as age_f:
+        age_f.write(json.dumps(age))
 
 
 post_submission_hook = update_profile_stats

lnt/server/instance.py

def frompath(path):
                 config_path = os.path.join(tmpdir, filenames[0], "lnt.cfg")
         else:
             config_path = path
 
         if not config_path or not os.path.exists(config_path):
             raise Exception("Invalid config: %r" % config_path)
 
         config_data = {}
-        exec(open(config_path).read(), config_data)
+        with open(config_path) as f:
+            exec(f.read(), config_data)
         config = lnt.server.config.Config.from_data(config_path, config_data)
 
         return Instance(config_path, config, tmpdir)
 
     def __init__(self, config_path, config, tmpdir=None):
         self.config_path = config_path
         self.config = config
         self.tmpdir = tmpdir

lnt/testing/profile/perf.py

 
 
 class LinuxPerfProfile(ProfileImpl):
     def __init__(self):
         pass
 
     @staticmethod
     def checkFile(fn):
-        return open(fn, 'rb').read(8) == b'PERFILE2'
+        with open(fn, 'rb') as f:
+            return f.read(8) == b'PERFILE2'
 
     @staticmethod
     def deserialize(f, nm='nm', objdump='objdump', propagateExceptions=False):
         f = f.name
 
         if os.path.getsize(f) == 0:
             # Empty file - exit early.
             return None

lnt/testing/profile/profilev1impl.py

functions: {
 
     @staticmethod
     def upgrade(old):
         raise RuntimeError("Cannot upgrade to version 1!")
 
     @staticmethod
     def checkFile(fn):
         # "zlib compressed data" - 78 9C
-        return open(fn, 'rb').read(2) == b'\x78\x9c'
+        with open(fn, 'rb') as f:
+            return f.read(2) == b'\x78\x9c'
 
     @staticmethod
     def deserialize(fobj):
         o = zlib.decompress(fobj.read())
         data = pickle.loads(o)
         return ProfileV1(data)
 
     def serialize(self, fname=None):

lnt/testing/profile/profilev2impl.py

def copy(self, counter_name_pool, line_counters,
         return new
 
 
 class ProfileV2(ProfileImpl):
     @staticmethod
     def checkFile(fn):
         # The first number is the version (2); ULEB encoded this is simply
         # 0x02.
-        return open(fn, 'rb').read(1) == b'\x02'
+        with open(fn, 'rb') as f:
+            return f.read(1) == b'\x02'
 
     @staticmethod
     def deserialize(fobj):
         p = ProfileV2()
 
         p.h = Header()
         p.cnp = CounterNamePool()
         p.tlc = TopLevelCounters(p.cnp)

lnt/testing/util/compilers.py

if llvm_capable:
         m = re.search('target triple = "(.*)"', cc_target_assembly)
         if m:
             cc_target, = m.groups()
         else:
             logger.error("unable to determine LLVM compiler target: %r: %r" %
                          (cc, cc_target_assembly))
 
     cc_exec_hash = hashlib.sha1()
-    cc_exec_hash.update(open(cc, 'rb').read())
+    with open(cc, 'rb') as f:
+        cc_exec_hash.update(f.read())
 
     info = {
         'cc_build': cc_build,
         'cc_name': cc_norm_name,
         'cc_version_number': cc_version_num,
         'cc_dumpmachine': cc_dumpmachine,
         'cc_target': cc_target,
         'cc_version': cc_version,

lnt/tests/test_suite.py

def _lit(self, path, test, profile):
                               '-j', str(nr_threads),
                               subdir,
                               '-o', output_json_path.name] + extra_args)
         except subprocess.CalledProcessError:
             # LIT is expected to exit with code 1 if there were test
             # failures!
             pass
         try:
-            return json.loads(open(output_json_path.name).read())
+            with open(output_json_path.name) as f:
+                return json.loads(f.read())
         except ValueError as e:
             fatal("Running test-suite did not create valid json report "
                   "in {}: {}".format(output_json_path.name, e))
 
     def _is_pass_code(self, code):
         return code in ('PASS', 'XPASS', 'XFAIL')
 
     def _get_lnt_code(self, code):

tests/runtest/test_suite-profile-import.py

 # RUN: rm -rf %t.DB
 # RUN: lnt create %t.DB >> %t.log 2>> %t.err
 # RUN: lnt import %t.DB %t.SANDBOX/build/report.json \
 # RUN:   --show-sample-count >> %t.log 2>> %t.err
 # RUN: python %s %t.DB
 
 import sys
 import glob
-import glob
 from lnt.testing.profile.profilev2impl import ProfileV2
 
 profile = glob.glob('%s/data/profiles/*.lntprof' % sys.argv[1])[0]
 assert ProfileV2.checkFile(profile)