Skip to content

Fix Xen integration test #4339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 7, 2019
Merged

Fix Xen integration test #4339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions integration/xen/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion integration/xen/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down