Get tests passing on Docker

The Dockerfiles needed to set LD_LIBRARY_PATH.

For some bizarre reason I needed to build the parser and emitter twice.
Since I plan to redo the building of these binaries later, this is OK
for now, since all tests on all CICDs will pass.

The docker stuff was needed by the semaphoreci system.

diff --git a/dockerfiles/ubuntu-14.04 b/dockerfiles/ubuntu-14.04
index 72d53ad302023308405d0dea536258620db684e6..b24688360cd2909fe87cd1ccd24fdd15d19c4ea1 100644 (file)
--- a/dockerfiles/ubuntu-14.04
+++ b/dockerfiles/ubuntu-14.04
@@ -15,6 +15,8 @@ RUN mkdir /libyaml
 COPY . /libyaml/
 WORKDIR /libyaml
 
+ENV LD_LIBRARY_PATH=/libyaml/src/.libs
+
 RUN ./bootstrap
 RUN ./configure
 RUN make

diff --git a/dockerfiles/ubuntu-16.04 b/dockerfiles/ubuntu-16.04
index edb51bffba5a7cbf23f904b8fb6866d277ac13e8..5c4ee17da334abedb70541bd200cccf3a9c12185 100644 (file)
--- a/dockerfiles/ubuntu-16.04
+++ b/dockerfiles/ubuntu-16.04
@@ -15,6 +15,8 @@ RUN mkdir /libyaml
 COPY . /libyaml/
 WORKDIR /libyaml
 
+ENV LD_LIBRARY_PATH=/libyaml/src/.libs
+
 RUN ./bootstrap
 RUN ./configure
 RUN make

diff --git a/tests/run-test-suite/Makefile b/tests/run-test-suite/Makefile
index bdf89f68103b1322558672e356f2f9502ee66e68..3d39edc3568ad31f969a661a7b65174cc8f5d901 100644 (file)
--- a/tests/run-test-suite/Makefile
+++ b/tests/run-test-suite/Makefile
@@ -23,7 +23,8 @@ data:
        git clone $(TEST_SUITE_URL) $@ --branch=$@
 
 %/libyaml-parser %/libyaml-emitter: %
-       (cd $<; make build)
+       (cd $<; make clean build)
+       (cd $<; make clean build)
 
 libyaml-parser-emitter:
        git clone $(GITHUB_ORG_URI)/$@ $@