From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45118)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1bUmGR-0005Si-6c
	for qemu-devel@nongnu.org; Tue, 02 Aug 2016 22:50:36 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1bUmGL-0002Yn-8S
	for qemu-devel@nongnu.org; Tue, 02 Aug 2016 22:50:34 -0400
Received: from mx1.redhat.com ([209.132.183.28]:57498)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1bUmGL-0002Yh-2o
	for qemu-devel@nongnu.org; Tue, 02 Aug 2016 22:50:29 -0400
Date: Wed, 3 Aug 2016 10:50:25 +0800
From: Fam Zheng <famz@redhat.com>
Message-ID: <20160803025025.GD8117@ad.usersys.redhat.com>
References: <1468938677-15607-1-git-send-email-famz@redhat.com>
	<1468938677-15607-10-git-send-email-famz@redhat.com>
	<ffae2c78-8eb2-9023-90e3-0880258f0119@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ffae2c78-8eb2-9023-90e3-0880258f0119@redhat.com>
Subject: Re: [Qemu-devel] [PULL 09/10] docker: Don't start a container that
 doesn't exist
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org, peter.maydell@linaro.org

On Tue, 08/02 20:59, Paolo Bonzini wrote:
> 
> 
> On 19/07/2016 16:31, Fam Zheng wrote:
> > Image building targets are dependencies of test running targets, so when
> > a docker image doesn't exist, it means it's skipped (due to dependency
> > checks in pre script). Therefore, skip the test too.
> > 
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > Message-id: 1468934445-32183-10-git-send-email-famz@redhat.com
> > ---
> >  tests/docker/Makefile.include | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> > 
> > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> > index c5546ee..e7f0023 100644
> > --- a/tests/docker/Makefile.include
> > +++ b/tests/docker/Makefile.include
> > @@ -105,7 +105,10 @@ docker-run-%: docker-qemu-src
> >  	fi
> >  	$(if $(filter $(TESTS),$(CMD)),$(if $(filter $(IMAGES),$(IMAGE)), \
> >  		$(call quiet-command,\
> > -			$(SRC_PATH)/tests/docker/docker.py run $(if $V,,--rm) \
> > +			if $(SRC_PATH)/tests/docker/docker.py images \
> > +				--format={{.Repository}}:{{.Tag}} | \
> > +					grep -qx qemu:$(IMAGE); then \
> > +				$(SRC_PATH)/tests/docker/docker.py run $(if $V,,--rm) \
> >  				-t \
> >  				$(if $(DEBUG),-i,--net=none) \
> >  				-e TARGET_LIST=$(TARGET_LIST) \
> > @@ -117,6 +120,7 @@ docker-run-%: docker-qemu-src
> >  				qemu:$(IMAGE) \
> >  				/var/tmp/qemu/run \
> >  				$(CMD); \
> > +			fi \
> >  			, "  RUN $(CMD) in $(IMAGE)")))
> >  
> >  docker-clean:
> > 
> 
> This breaks the version of Docker in RHEL7.2, which doesn't have
> --format.  Is it possible to revert it?

I'll work on a fix today.

Fam