Merge branch 'develop' into 'master'

Changes in test container and script

See merge request !5

src/cclmwe/tests/custom_annotations/Dockerfile

@@ -29,11 +29,8 @@ RUN apt-get update && apt-get install -y \
 
 # Install wccl from branch with change
 WORKDIR /home/install
-RUN git clone --single-branch \
-	--branch ann_base_bug \
-	https://gitlab.clarin-pl.eu/analysers/wccl.git
+RUN git clone https://gitlab.clarin-pl.eu/analysers/wccl.git
 RUN mkdir wccl/src/build && \
-	cat wccl/src/libmwereader/mwereader.cpp && \
     cd wccl/src/build && \
     cmake .. && \
     make -j 8 && \
@@ -43,7 +40,8 @@ RUN mkdir wccl/src/build && \
 # install corpus2mwe from this repository (branch param_ann)
 WORKDIR /home/install
 COPY ./ ./corpus2mwe
-RUN mkdir corpus2mwe/build && \
+RUN rm -rf corpus2mwe/build && \
+	mkdir corpus2mwe/build && \
     cd corpus2mwe/build && \
     cmake .. && \
     make -j 8 && \

src/cclmwe/tests/custom_annotations/test.sh

 #!/bin/bash
 # Execute this script to call test cases inside testing container 
 
-# docker build ../../.. -t corpus2mwe_wccl_param_ann -f Dockerfile --no-cache
-docker build ../../.. -t corpus2mwe_wccl_param_ann -f Dockerfile
+docker build ../../.. -t corpus2mwe_wccl_test -f Dockerfile
+
+ret_code=$?
+if [ $ret_code -ne 0 ]; then
+	echo "Error during building!"
+	exit $ret_code
+fi
+
 docker run --rm \
 	-v $(pwd)/test_container.sh:/home/install/test_container.sh \
-	corpus2mwe_wccl_param_ann \
+	corpus2mwe_wccl_test \
 	bash -c '/home/install/test_container.sh'

src/cclmwe/tests/custom_annotations/test_container.sh

 #!/bin/bash
 # Script called inside the container
 
+# remove old output files if exists
+cd /home/install/corpus2mwe/cclmwe/tests/testdata \
+	&& rm -f ccl_out.xml \
+	ccl_out2.xml \
+	ccl_out3.xml \
+	ccl_out4.xml \
+	ccl_annotated.txt \
+	ccl.xml.mwe \
+	ccl2.xml.mwe \
+	ccl_annotated.txt \
+	ccl.xml.mwe \
+	ccl2.xml.mwe \
+	ccl_out7.xml \
+	ccl_ann_bug1_out.xml
+
 echo "==> (1/7) Annotating without setting annotation name (default annotation and dict):"
 wccl_annotator -c /home/install/corpus2mwe/cclmwe/tests/testdata/ccl.xml \
 	-o /home/install/corpus2mwe/cclmwe/tests/testdata/ccl_out.xml