diff options
| author | Nobuaki Sukegawa <nsuke@apache.org> | 2016-01-12 19:20:05 +0900 |
|---|---|---|
| committer | Nobuaki Sukegawa <nsuke@apache.org> | 2016-01-19 02:48:07 +0900 |
| commit | ffc2bb3dd7afc3214bddc0bcd656ea79f3ead427 (patch) | |
| tree | f83ac433aa18f53b01c511a9c9218c87c2ca15fa /Makefile.am | |
| parent | baa110126d48b999dd4dff700e1f26559667487d (diff) | |
| download | thrift-ffc2bb3dd7afc3214bddc0bcd656ea79f3ead427.tar.gz | |
THRIFT-3439 Run make cross using Python3 when available
Client: Test
Patch: Nobuaki Sukegawa
Add Makefile.am change that was missing in the original patch.
This closes #792
Diffstat (limited to 'Makefile.am')
| -rwxr-xr-x | Makefile.am | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 3eaa94e67..f2ce16a53 100755 --- a/Makefile.am +++ b/Makefile.am @@ -42,9 +42,6 @@ precross-%: all $(MAKE) -C $* precross precross: all precross-test precross-lib -# TODO: generate --server and --client switches from "--with(out)-..." build flags - - empty := space := $(empty) $(empty) comma := , @@ -52,14 +49,20 @@ comma := , CROSS_LANGS = @MAYBE_CPP@ @MAYBE_C_GLIB@ @MAYBE_JAVA@ @MAYBE_CSHARP@ @MAYBE_PYTHON@ @MAYBE_PY3@ @MAYBE_RUBY@ @MAYBE_HASKELL@ @MAYBE_PERL@ @MAYBE_PHP@ @MAYBE_GO@ @MAYBE_NODEJS@ @MAYBE_DART@ @MAYBE_ERLANG@ CROSS_LANGS_COMMA_SEPARATED = $(subst $(space),$(comma),$(CROSS_LANGS)) +if WITH_PY3 +CROSS_PY=$(PYTHON3) +else +CROSS_PY=$(PYTHON) +endif + cross: precross - $(PYTHON) test/test.py -F.* -s --server $(CROSS_LANGS_COMMA_SEPARATED) - $(PYTHON) test/test.py -s --server $(CROSS_LANGS_COMMA_SEPARATED) --client $(CROSS_LANGS_COMMA_SEPARATED) + $(CROSS_PY) test/test.py -F.* -s --server $(CROSS_LANGS_COMMA_SEPARATED) + $(CROSS_PY) test/test.py -s --server $(CROSS_LANGS_COMMA_SEPARATED) --client $(CROSS_LANGS_COMMA_SEPARATED) TIMES = 1 2 3 fail: precross - $(PYTHON) test/test.py || true - $(PYTHON) test/test.py --update-expected-failures=overwrite + $(CROSS_PY) test/test.py || true + $(CROSS_PY) test/test.py --update-expected-failures=overwrite $(foreach var,$(TIMES),test/test.py -s || true;test/test.py --update-expected-failures=merge;) codespell_skip_files = \ |