From: Ingy döt Net <ingy@ingy.net>
Date: Fri, 30 Dec 2016 21:54:54 +0000 (-0600)
Subject: Get tests passing on Docker
X-Git-Tag: upstream/0.2.1^2~28
X-Git-Url: http://andersk.mit.edu/gitweb/libyaml.git/commitdiff_plain/048095f030bdd05276e5b1c6d9f954f367aa0022

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 72d53ad..b246883 100644
--- 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 edb51bf..5c4ee17 100644
--- 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 bdf89f6..3d39edc 100644
--- 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)/$@ $@