Skip to content

Commit 2edc480

Browse files
committed
Cleanup tests
Fix ResourceWarnings due to unclosed files. Remove fake-nm.py and corresponding input files (not used anymore). Reviewed By: cmatthews Differential Revision: https://reviews.llvm.org/D144025
1 parent 0476ded commit 2edc480

File tree

6 files changed

+25
-92
lines changed

6 files changed

+25
-92
lines changed

tests/testing/Inputs/fake-nm.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

tests/testing/Inputs/fake-objdump.py

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
import sys
22

3-
for a in sys.argv:
4-
if a.startswith('--start-address'):
5-
addr = a.split('=')[1]
63

7-
fname = '%s.%s.out' % (sys.argv[1], addr)
8-
sys.stdout.write(open(fname).read())
9-
sys.exit(0)
4+
def exit_with_fake_output(suffix):
5+
fname = '%s.%s' % (sys.argv[1], suffix)
6+
with open(fname) as f:
7+
sys.stdout.write(f.read())
8+
sys.exit(0)
109

11-
if a.startswith('-t'):
12-
fname = '%s.out' % sys.argv[1]
13-
sys.stdout.write(open(fname).read())
14-
sys.exit(0)
10+
11+
for arg in sys.argv:
12+
if arg.startswith('--start-address'):
13+
addr = arg.split('=')[1]
14+
exit_with_fake_output('%s.out' % addr)
15+
16+
if arg.startswith('-t'):
17+
exit_with_fake_output('out')
1518

1619
sys.exit(1)

tests/testing/Inputs/fib-aarch64.nm.out

Lines changed: 0 additions & 31 deletions
This file was deleted.

tests/testing/Inputs/fib2-aarch64.nm.out

Lines changed: 0 additions & 31 deletions
This file was deleted.

tests/testing/cPerf.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,30 +170,28 @@ def _getObjdump(self, perf_data_fname):
170170
def _getInput(self, fname):
171171
return os.path.join(self.inputs, fname)
172172

173+
def _loadPerfDataInput(self, fname):
174+
perf_data = self._getInput(fname)
175+
fake_objdump = self._getObjdump(perf_data)
176+
with open(perf_data, 'rb') as f:
177+
return LinuxPerfProfile.deserialize(
178+
f, objdump=fake_objdump, propagateExceptions=True)
179+
173180
def test_check_file(self):
174181
self.assertTrue(LinuxPerfProfile.checkFile(self._getInput('fib-aarch64.perf_data')))
175182

176183
def test_aarch64_fib(self):
177-
perf_data = self._getInput('fib-aarch64.perf_data')
178-
p = LinuxPerfProfile.deserialize(open(perf_data, 'rb'),
179-
objdump=self._getObjdump(perf_data),
180-
propagateExceptions=True)
184+
p = self._loadPerfDataInput('fib-aarch64.perf_data')
181185

182186
self.assertEqual(p.data, self.expected_data['fib-aarch64'])
183187

184188
def test_aarch64_fib2(self):
185-
perf_data = self._getInput('fib2-aarch64.perf_data')
186-
p = LinuxPerfProfile.deserialize(open(perf_data, 'rb'),
187-
objdump=self._getObjdump(perf_data),
188-
propagateExceptions=True)
189+
p = self._loadPerfDataInput('fib2-aarch64.perf_data')
189190

190191
self.assertEqual(p.data, self.expected_data['fib2-aarch64'])
191192

192193
def test_aarch64_fib2_nondynamic(self):
193-
perf_data = self._getInput('fib2-aarch64.perf_data')
194-
p = LinuxPerfProfile.deserialize(open(perf_data, 'rb'),
195-
objdump=self._getObjdump(perf_data),
196-
propagateExceptions=True)
194+
p = self._loadPerfDataInput('fib2-aarch64.perf_data')
197195

198196
self.assertEqual(p.data, self.expected_data['fib2-aarch64'])
199197

tests/testing/profilev1impl.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ def test_saveFromRendered(self):
5454

5555
with tempfile.NamedTemporaryFile() as f:
5656
Profile.saveFromRendered(s, filename=f.name)
57-
p2 = ProfileV1.deserialize(open(f.name, "rb"))
57+
with open(f.name, 'rb') as f2:
58+
p2 = ProfileV1.deserialize(f2)
5859

5960
self.assertEqual(p2.data, self.test_data)
6061

0 commit comments

Comments
 (0)