Commit 605bb9b4 authored by Ben Gamari's avatar Ben Gamari Committed by Ben Gamari

testsuite: Use python3 by default

Summary:
It turns out that Phyx's fix for #12554 (D2684) still fails with mingw-w64
python 2.7. However, Python 3 (both msys2 and mingw-w64) work fine. Given that
supporting Python 2 has already become rather tiresome (as @thomie warned it
would), let's just move to python3 by default.

Test Plan: Validate

Reviewers: austin, Phyx

Reviewed By: Phyx

Subscribers: Phyx, thomie

Differential Revision: https://phabricator.haskell.org/D2766

GHC Trac Issues: #12554
parent dd9ba503
#
#!/usr/bin/env python3
#
# (c) Simon Marlow 2002
#
......@@ -24,9 +26,6 @@ import re
import subprocess
PYTHON3 = sys.version_info >= (3, 0)
if PYTHON3:
print("*** WARNING: running testsuite using Python 3.\n"
"*** Python 3 support is experimental. See Trac #9184.")
from testutil import *
from testglobals import *
......
......@@ -217,15 +217,7 @@ $(eval $(call canonicalise,TOP_ABS))
GS = gs
CP = cp
RM = rm -f
# Allow the user to override the python version, just like with validate
ifeq "$(shell $(SHELL) -c '$(PYTHON) -c 0' 2> /dev/null && echo exists)" "exists"
else
ifeq "$(shell $(SHELL) -c 'python2 -c 0' 2> /dev/null && echo exists)" "exists"
PYTHON = python2
else
PYTHON = python
endif
endif
PYTHON = python3
CHECK_API_ANNOTATIONS := $(abspath $(TOP)/../inplace/bin/check-api-annotations)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment