From de0cbc38a94c7c7a17cefde48cf98ade43ea7fd3 Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Wed, 13 Sep 2017 12:16:34 +0200 Subject: [PATCH] Setup postgis for CI tests that depend on it --- .travis.yml | 4 ++++ scripts/postgis/setup_and_run.sh | 4 ++++ 2 files changed, 8 insertions(+) create mode 100755 scripts/postgis/setup_and_run.sh diff --git a/.travis.yml b/.travis.yml index c2eb0d4e0d..8fcb5ffb0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ install: # we use before_script rather than script to ensure fast failure (the script section continues even after an error) # https://docs.travis-ci.com/user/customizing-the-build#Breaking-the-Build before_script: + - source scripts/postgis/setup_and_run.sh - npm test # after successful tests, publish binaries if specified in commit message - ./scripts/publish.sh --toolset=${TOOLSET:-} --debug=$([ "${BUILDTYPE}" == 'debug' ] && echo "true" || echo "false") @@ -117,6 +118,7 @@ matrix: - export LD_PRELOAD=${MASON_LLVM_RT_PRELOAD} # TODO: re-enable detect_leaks=0 once we can build and test against an asan sanitized libc++ - export ASAN_OPTIONS=fast_unwind_on_malloc=0:detect_leaks=0:${ASAN_OPTIONS} + - source scripts/postgis/setup_and_run.sh - npm test - unset LD_PRELOAD # after successful tests, publish binaries if specified in commit message @@ -137,6 +139,7 @@ matrix: - make ${BUILDTYPE} # Overrides `script` to disable publishing before_script: + - source scripts/postgis/setup_and_run.sh - npm test # Coverage build - os: linux @@ -144,6 +147,7 @@ matrix: node_js: 4 # Overrides `script` to publish coverage data to codecov before_script: + - source scripts/postgis/setup_and_run.sh - npm test - mason install llvm-cov ${MASON_LLVM_RELEASE} - mason link llvm-cov ${MASON_LLVM_RELEASE} diff --git a/scripts/postgis/setup_and_run.sh b/scripts/postgis/setup_and_run.sh new file mode 100755 index 0000000000..210eb5988b --- /dev/null +++ b/scripts/postgis/setup_and_run.sh @@ -0,0 +1,4 @@ +./scripts/postgis/setup.sh +./scripts/postgis/initialize.sh +./scripts/postgis/run.sh +source mason-postgis-config.env