From 16791bc2878f40efa3384269643fbcb1106f1735 Mon Sep 17 00:00:00 2001 From: Greg Landrum Date: Wed, 23 Mar 2016 14:10:52 +0100 Subject: [PATCH] switch to ctest instead of 'make test' A fix to help with builds on the Mac (there was an environment and shared library problem on El Capitan) also runs tests in parallel Given that ctest is part of cmake, which is required, this shouldn't be a problem anywhere. --- rdkit/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rdkit/build.sh b/rdkit/build.sh index 1f16c5e..40b49bd 100644 --- a/rdkit/build.sh +++ b/rdkit/build.sh @@ -26,10 +26,10 @@ cmake \ make -j$CPU_COUNT if [[ `uname` == 'Linux' ]]; then - RDBASE=$SRC_DIR LD_LIBRARY_PATH="$PREFIX/lib:$SRC_DIR/lib" PYTHONPATH=$SRC_DIR make test + RDBASE=$SRC_DIR LD_LIBRARY_PATH="$PREFIX/lib:$SRC_DIR/lib" PYTHONPATH=$SRC_DIR ctest -j$CPU_COUNT RDBASE=$SRC_DIR LD_LIBRARY_PATH="$PREFIX/lib:$SRC_DIR/lib" PYTHONPATH=$SRC_DIR $PYTHON "$RECIPE_DIR/pkg_version.py" else - RDBASE=$SRC_DIR DYLD_FALLBACK_LIBRARY_PATH="$PREFIX/lib:$SRC_DIR/lib" PYTHONPATH=$SRC_DIR make test + RDBASE=$SRC_DIR DYLD_FALLBACK_LIBRARY_PATH="$PREFIX/lib:$SRC_DIR/lib" PYTHONPATH=$SRC_DIR ctest -j$CPU_COUNT RDBASE=$SRC_DIR DYLD_FALLBACK_LIBRARY_PATH="$PREFIX/lib:$SRC_DIR/lib" PYTHONPATH=$SRC_DIR $PYTHON "$RECIPE_DIR/pkg_version.py" fi