[PATCH] makefile: run Rust tests if cargo is installed

Raphaël Gomès raphael.gomes at octobus.net
Thu Aug 22 02:11:46 EDT 2019


Good catch. I somehow screwed up twice in the same patch with the 
comment and this bit. The original patch did not even apply locally, go 
figure. My follow up should address that.

On 8/22/19 6:44 AM, Anton Shestakov wrote:
> On Wed, 21 Aug 2019 18:09:33 +0200
> Raphaël Gomès <raphael.gomes at octobus.net> wrote:
>
>> # HG changeset patch
>> # User Raphaël Gomès <rgomes at octobus.net>
>> # Date 1566403010 -7200
>> #      Wed Aug 21 17:56:50 2019 +0200
>> # Branch stable
>> # Node ID 5b9efc6098154fb5079f06b3c485b58363e0f43d
>> # Parent  302dbc9d52beeb2ef677aa18b3fa005bbce2134e
>> makefile: run Rust tests if cargo is installed
>>
>> While no particular minimum toolchain version is targeted as of yet, this
>> serves as a first step to make more people/machines run the Rust tests.
>>
>> diff -r 302dbc9d52be -r 5b9efc609815 Makefile
>> --- a/Makefile	Fri Aug 16 15:41:53 2019 +0300
>> +++ b/Makefile	Wed Aug 21 17:56:50 2019 +0200
>> @@ -110,8 +110,11 @@
>>   check: tests
>>   
>>   tests:
>> -	cd tests && $(PYTHON) run-tests.py $(TESTFLAGS)
>> -
>> +	if [ -x "$$(command -v cargo)" ]; then \
>> +		# Run Rust tests if cargo is installed
>> +		cd $(HGROOT)/rust/hg-cpython && cargo test --quiet --all; \
>> +	fi;
>> +	cd tests && $(PYTHON) run-tests.py $(TESTFLAGS) && \
>>   test-%:
> I most likely forgot all the intricacies of make syntax, but this looks
> like a shell command is getting chained by && with a make target?
>
> Also an unrelated change removes an empty line between "tests" and
> "test-%" targets.
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list