Skip to content

Commit dbaa555

Browse files
committed
Also update associated tests for new easyconfig
1 parent eb0bc4b commit dbaa555

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

test/framework/easyconfigs/test_ecs/g/GCC/GCC-10.2.0.eb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,5 @@ dependencies = [
1616
('binutils', '2.35', '', ('GCCcore', version)),
1717
]
1818

19-
altroot = 'GCCcore'
20-
altversion = 'GCCcore'
21-
2219
# this bundle serves as a compiler-only toolchain, so it should be marked as compiler (important for HMNS)
2320
moduleclass = 'compiler'

test/framework/filetools.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2271,8 +2271,8 @@ def test_copy_dir(self):
22712271

22722272
ft.copy_dir(to_copy, target_dir, ignore=lambda src, names: [x for x in names if '6.4.0-2.28' in x])
22732273
self.assertExists(target_dir)
2274-
expected = ['GCC-4.6.3.eb', 'GCC-4.6.4.eb', 'GCC-4.8.2.eb', 'GCC-4.8.3.eb', 'GCC-4.9.2.eb', 'GCC-4.9.3-2.25.eb',
2275-
'GCC-4.9.3-2.26.eb', 'GCC-7.3.0-2.30.eb']
2274+
expected = ['GCC-10.2.0.eb', 'GCC-4.6.3.eb', 'GCC-4.6.4.eb', 'GCC-4.8.2.eb', 'GCC-4.8.3.eb', 'GCC-4.9.2.eb',
2275+
'GCC-4.9.3-2.25.eb', 'GCC-4.9.3-2.26.eb', 'GCC-7.3.0-2.30.eb']
22762276
self.assertEqual(sorted(os.listdir(target_dir)), expected)
22772277
# GCC-6.4.0-2.28.eb should not get copied, since it's specified as file too ignore
22782278
self.assertNotExists(os.path.join(target_dir, 'GCC-6.4.0-2.28.eb'))
@@ -2613,7 +2613,7 @@ def test_index_functions(self):
26132613
# test with specified path with and without trailing '/'s
26142614
for path in [test_ecs, test_ecs + '/', test_ecs + '//']:
26152615
index = ft.create_index(path)
2616-
self.assertEqual(len(index), 94)
2616+
self.assertEqual(len(index), 95)
26172617

26182618
expected = [
26192619
os.path.join('b', 'bzip2', 'bzip2-1.0.6-GCC-4.9.2.eb'),

test/framework/tweak.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def test_find_matching_easyconfigs(self):
8080
self.assertTrue(len(ecs) == 1 and ecs[0].endswith('/%s-%s.eb' % (name, installver)))
8181

8282
ecs = find_matching_easyconfigs('GCC', '*', [test_easyconfigs_path])
83-
gccvers = ['4.6.3', '4.6.4', '4.8.2', '4.8.3', '4.9.2', '4.9.3-2.25', '4.9.3-2.26', '6.4.0-2.28', '7.3.0-2.30']
83+
gccvers = ['10.2.0', '4.6.3', '4.6.4', '4.8.2', '4.8.3', '4.9.2', '4.9.3-2.25', '4.9.3-2.26', '6.4.0-2.28', '7.3.0-2.30']
8484
self.assertEqual(len(ecs), len(gccvers))
8585
ecs_basename = [os.path.basename(ec) for ec in ecs]
8686
for gccver in gccvers:

0 commit comments

Comments
 (0)