On Thu, 06/28 13:46, Philippe Mathieu-Daudé wrote: > We can still run any test in Travis. > > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> > --- > tests/docker/Makefile.include | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include > index 91d9665517..7d9d568eee 100644 > --- a/tests/docker/Makefile.include > +++ b/tests/docker/Makefile.include > @@ -99,11 +99,17 @@ docker-image-tricore-cross: docker-image-debian9 > > # Expand all the pre-requistes for each docker image and test combination > $(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \ > - $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ > + $(foreach t,$(DOCKER_TESTS), \ > $(eval .PHONY: docker-$t@$i) \ > $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ > + $(eval docker-test: docker-$t@$i) \ > ) \ > - $(foreach t,$(DOCKER_TESTS), \ > +) > +# we only run Travis tests on the Travis image > +$(foreach i,travis, \ > + $(foreach t,$(DOCKER_TOOLS), \ > + $(eval .PHONY: docker-$t@$i) \ > + $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ > $(eval docker-test: docker-$t@$i) \ > ) \ > ) > -- > 2.18.0 >
Apart from Alex's concern (which I don't have), I suppose a 'requires travis' and 'ENV features travis' pair is the correct way to do it. See test-mingw for example. Fam
