Merge pull request #4339 from tautschnig/fix-xen-integration-test

Fix Xen integration test

Author: tautschnig

integration/xen/Dockerfile

@@ -9,6 +9,7 @@ RUN apt-get update && apt-get --no-install-recommends -y install \
 
 ADD integration/xen/docker_compile_xen.sh docker_compile_xen.sh
 ADD src /tmp/cbmc/src
+ADD scripts /tmp/cbmc/scripts
 RUN ./docker_compile_xen.sh
 VOLUME /tmp/cbmc
 VOLUME /tmp/xen_compilation

integration/xen/Makefile

@@ -2,7 +2,7 @@ CONTAINER_ID = xen_build_container
 IMAGE_ID = xen_image
 
 all:
-	if docker ps | grep -q ^$(CONTAINER_ID) ; then \
+	if docker ps -a | grep -wq $(CONTAINER_ID) ; then \
 		docker rm xen_build_container ; \
 	fi
 	cd ../../ && docker build -t $(IMAGE_ID) -f integration/xen/Dockerfile .