From d2f72c7402d01f8a1fd7c58226864310f753a8b5 Mon Sep 17 00:00:00 2001 From: Andre Anjos Date: Mon, 15 Oct 2018 18:10:46 +0200 Subject: [PATCH] Tries yet another strategy --- conda/meta.yaml | 4 ++-- conda/run_test.sh | 42 ------------------------------------------ 2 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 conda/run_test.sh diff --git a/conda/meta.yaml b/conda/meta.yaml index 1212ece9..26fe73a8 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -57,8 +57,8 @@ test: commands: - worker --help - - sphinx-build -aEW {{ project_dir }}/doc {{ project_dir }}/sphinx - - sphinx-build -aEb doctest {{ project_dir }}/doc sphinx + - if [ -z "${BEAT_DOCKER_TESTS}" ]; then sphinx-build -aEW {{ project_dir }}/doc {{ project_dir }}/sphinx; fi + - if [ -z "${BEAT_DOCKER_TESTS}" ]; then sphinx-build -aEb doctest {{ project_dir }}/doc sphinx; fi - conda inspect linkages -p $PREFIX {{ name }} # [not win] - conda inspect objects -p $PREFIX {{ name }} # [osx] diff --git a/conda/run_test.sh b/conda/run_test.sh deleted file mode 100644 index d5aeeffd..00000000 --- a/conda/run_test.sh +++ /dev/null @@ -1,42 +0,0 @@ -#/usr/bin/env bash - -# Checks whether to use "date" or "gdate" -gnudate() { - if hash gdate 2>/dev/null; then - echo gdate - else - echo date - fi -} -DATE=`gnudate` - -# datetime prefix for logging -log_datetime() { - echo "($(${DATE} +%T.%3N))" -} - -# Functions for coloring echo commands -log_info() { - echo -e "$(log_datetime) \033[1;34m${@}\033[0m" -} - -log_error() { - echo -e "$(log_datetime) \033[1;31mError: ${@}\033[0m" >&2 -} - -# Function for running command and echoing results -run_cmd() { - log_info "$ ${@}" - ${@} - local status=$? - if [ ${status} != 0 ]; then - log_error "Command Failed \"${@}\"" - exit ${status} - fi -} - -if [ -z "${BEAT_DOCKER_TESTS}" ]; then - run_cmd nosetests --with-coverage --cover-package=${PKG_NAME} -sv ${PKG_NAME} --exclude=".*test_docker.*" -else - run_cmd nosetests --with-coverage --cover-package=${PKG_NAME} -sv ${PKG_NAME} -fi -- 2.21.0