@@ -2274,7 +2274,7 @@ def test_independence(self):
22742274 """Test independency of toolchain instances."""
22752275
22762276 # tweaking --optarch is required for Cray toolchains (craypre-<optarch> module must be available)
2277- custom_optarchs = ['test' , '-test' ] # specifying without initial - is deprecated but should still work
2277+ custom_optarchs = ['test' , '-test' ] # specifying without initial "-" is deprecated but should still work
22782278 for custom_optarch in custom_optarchs :
22792279 init_config (build_options = {'optarch' : custom_optarch , 'silent' : True })
22802280
@@ -2288,13 +2288,16 @@ def test_independence(self):
22882288 }
22892289
22902290 toolchains = [
2291- ('CrayCCE' , '2015.06-XC' ),
2292- ('CrayGNU' , '2015.06-XC' ),
2293- ('CrayIntel' , '2015.06-XC' ),
22942291 ('GCC' , '6.4.0-2.28' ),
22952292 ('iccifort' , '2018.1.163' ),
22962293 ('intel-compilers' , '2022.1.0' ),
22972294 ]
2295+ if custom_optarchs == 'test' : # optarch is not used as a flag for Cray
2296+ toolchains += [
2297+ ('CrayCCE' , '2015.06-XC' ),
2298+ ('CrayGNU' , '2015.06-XC' ),
2299+ ('CrayIntel' , '2015.06-XC' ),
2300+ ]
22982301
22992302 # purposely obtain toolchains several times in a row, value for $CFLAGS should not change
23002303 for _ in range (3 ):
0 commit comments