@@ -880,19 +880,29 @@ def test_pythondevmode_env(self):
880
880
self .assertEqual (proc .stdout .rstrip (), 'True' )
881
881
self .assertEqual (proc .returncode , 0 , proc )
882
882
883
- @unittest .skipUnless (support .Py_GIL_DISABLED ,
884
- "PYTHON_GIL and -X gil only supported in Py_GIL_DISABLED builds" )
885
883
def test_python_gil (self ):
886
884
cases = [
887
885
# (env, opt, expected, msg)
888
- (None , None , 'None' , "no options set" ),
889
- ('0' , None , '0' , "PYTHON_GIL=0" ),
890
886
('1' , None , '1' , "PYTHON_GIL=1" ),
891
- ('1' , '0' , '0' , "-X gil=0 overrides PYTHON_GIL=1" ),
892
- (None , '0' , '0' , "-X gil=0" ),
893
887
(None , '1' , '1' , "-X gil=1" ),
894
888
]
895
889
890
+ if support .Py_GIL_DISABLED :
891
+ cases .extend (
892
+ [
893
+ (None , None , 'None' , "no options set" ),
894
+ ('0' , None , '0' , "PYTHON_GIL=0" ),
895
+ ('1' , '0' , '0' , "-X gil=0 overrides PYTHON_GIL=1" ),
896
+ (None , '0' , '0' , "-X gil=0" ),
897
+ ]
898
+ )
899
+ else :
900
+ cases .extend (
901
+ [
902
+ (None , None , '1' , '-X gil=0 (unsupported by this build)' ),
903
+ ('1' , None , '1' , 'PYTHON_GIL=0 (unsupported by this build)' ),
904
+ ]
905
+ )
896
906
code = "import sys; print(sys.flags.gil)"
897
907
environ = dict (os .environ )
898
908
0 commit comments