Skip to content

Commit 0796fd7

Browse files
committed
Fix Xen integration test
1) We need the scripts/ directory inside the container to patch MiniSat. 2) Use -a with `docker ps` to also list containers that aren't running, and don't expect the container name at the beginning of the line.
1 parent 4f19015 commit 0796fd7

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

integration/xen/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ RUN apt-get update && apt-get --no-install-recommends -y install \
99

1010
ADD integration/xen/docker_compile_xen.sh docker_compile_xen.sh
1111
ADD src /tmp/cbmc/src
12+
ADD scripts /tmp/cbmc/scripts
1213
RUN ./docker_compile_xen.sh
1314
VOLUME /tmp/cbmc
1415
VOLUME /tmp/xen_compilation

integration/xen/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CONTAINER_ID = xen_build_container
22
IMAGE_ID = xen_image
33

44
all:
5-
if docker ps | grep -q ^$(CONTAINER_ID) ; then \
5+
if docker ps -a | grep -wq $(CONTAINER_ID) ; then \
66
docker rm xen_build_container ; \
77
fi
88
cd ../../ && docker build -t $(IMAGE_ID) -f integration/xen/Dockerfile .

0 commit comments

Comments
 (0)