Skip to content

Commit e6bc403

Browse files
author
Caspar van Leeuwen
committed
Environment reset is not needed at the end of the test, each one starts with clean env. The real problem was that the template_constant_dict has changed, so the expected output is now different - and should include sysroot and its value
1 parent ea000b2 commit e6bc403

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

test/framework/easyconfig.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1367,17 +1367,13 @@ def test_sysroot_template(self):
13671367

13681368
# Validate the value of the sysroot template if sysroot is unset (i.e. the build option is None)
13691369
# As a test, we'll set the sysroot to self.test_prefix, as it has to be a directory that is guaranteed to exist
1370-
old_sysroot = build_option('sysroot')
13711370
update_build_option('sysroot', self.test_prefix)
13721371

13731372
ec = EasyConfig(test_ec)
13741373
self.assertEqual(ec['configopts'], "--some-opt=%s/" % self.test_prefix)
13751374
self.assertEqual(ec['buildopts'], "--some-opt=%s/" % self.test_prefix)
13761375
self.assertEqual(ec['installopts'], "--some-opt=%s/" % self.test_prefix)
13771376

1378-
# Restore original value for sysroot build option
1379-
update_build_option('sysroot', old_sysroot)
1380-
13811377
def test_constant_doc(self):
13821378
"""test constant documentation"""
13831379
doc = avail_easyconfig_constants()
@@ -3266,6 +3262,7 @@ def test_template_constant_dict(self):
32663262
'nameletter': 'g',
32673263
'nameletterlower': 'g',
32683264
'parallel': None,
3265+
'sysroot': '',
32693266
'toolchain_name': 'foss',
32703267
'toolchain_version': '2018a',
32713268
'version': '1.5',

0 commit comments

Comments
 (0)