From 03e2f043df5f2c353ad5fe787d158110323c38cd Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Wed, 16 Sep 2015 06:49:04 +0000 Subject: [PATCH] Address #726 review comments --- docs/contributing.rst | 15 +++++++-------- tests/boulder-integration.sh | 2 ++ tests/boulder-start.sh | 1 + 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/contributing.rst b/docs/contributing.rst index 00ac509ab..f85e37c39 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -68,17 +68,16 @@ The following tools are there to help you: Integration ~~~~~~~~~~~ -First, install `Go`_ 1.5 (pick a value for GOPATH and put $GOPATH/bin in your -PATH), libtool-ltdl, mariadb-server and rabbitmq-server and then start -Boulder_, an ACME CA server:: +First, install `Go`_ 1.5, libtool-ltdl, mariadb-server and +rabbitmq-server and then start Boulder_, an ACME CA server:: ./tests/boulder-start.sh -The script will download, compile and run the executable; please be patient - -it will take some time... Once its ready, you will see ``Server running, -listening on 127.0.0.1:4000...``. Add the ``venv/bin/`` subdirectory of your -letsencrypt repo to your path, and add an ``/etc/hosts`` entry pointing -``le.wtf`` to 127.0.0.1. You may now run (in a separate terminal):: +The script will download, compile and run the executable; please be +patient - it will take some time... Once its ready, you will see +``Server running, listening on 127.0.0.1:4000...``. Add an +``/etc/hosts`` entry pointing ``le.wtf`` to 127.0.0.1. You may now +run (in a separate terminal):: ./tests/boulder-integration.sh && echo OK || echo FAIL diff --git a/tests/boulder-integration.sh b/tests/boulder-integration.sh index 67cc4c5e9..ed877d136 100755 --- a/tests/boulder-integration.sh +++ b/tests/boulder-integration.sh @@ -11,6 +11,8 @@ . ./tests/integration/_common.sh export PATH="/usr/sbin:$PATH" # /usr/sbin/nginx +export GOPATH="${GOPATH:-/tmp/go}" +export PATH="$GOPATH/bin:$PATH" common() { letsencrypt_test \ diff --git a/tests/boulder-start.sh b/tests/boulder-start.sh index e17716b54..0875c3d2f 100755 --- a/tests/boulder-start.sh +++ b/tests/boulder-start.sh @@ -2,6 +2,7 @@ # Download and run Boulder instance for integration testing export GOPATH="${GOPATH:-/tmp/go}" +export PATH="$GOPATH/bin:$PATH" # `/...` avoids `no buildable Go source files` errors, for more info # see `go help packages`