diff options
| author | Ben Gamari <bgamari.foss@gmail.com> | 2016-11-29 16:58:24 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-11-29 20:38:43 -0500 |
| commit | 605bb9b4608121c462fb3d9f9281e7427f7ccc72 (patch) | |
| tree | bda583464bb600b390a5777b4dbe97fd513d4737 /testsuite/mk | |
| parent | dd9ba503bd4a2b3851098a7fa69e15682ab1c536 (diff) | |
| download | haskell-605bb9b4608121c462fb3d9f9281e7427f7ccc72.tar.gz | |
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
Diffstat (limited to 'testsuite/mk')
| -rw-r--r-- | testsuite/mk/boilerplate.mk | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk index 1aa58ab1e2..93b4f01f40 100644 --- a/testsuite/mk/boilerplate.mk +++ b/testsuite/mk/boilerplate.mk @@ -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) |