Commit 8619740b authored by Karl Wette's avatar Karl Wette

Merge branch 'skip-tests-that-fail-under-conda' into 'master'

More robust method of skipping tests that fail under Conda

See merge request lscsoft/lalsuite!1201
parents 0c59df40 83d1dcc0
......@@ -22,7 +22,7 @@ ${SRC_DIR}/configure \
make -j ${CPU_COUNT}
# check
make -j ${CPU_COUNT} check
make -j ${CPU_COUNT} check SKIP_TESTS_THAT_FAIL_UNDER_CONDA=1
# install
make -j ${CPU_COUNT} install
--- src/pulsar/Makefile.in 2018-09-24 21:01:41.000000000 +0100
+++ src/pulsar/Makefile.in 2018-12-30 19:15:12.000000000 +0000
@@ -472,5 +472,5 @@
SUBDIRS = Tools Injections SFTTools FITSTools $(END_OF_LINE) \
CreateEphemeris CrossCorr Fscan Fstatistic GCT \
HeterodyneSearch Hough HoughFstat MakeSFTs SidebandSearch \
- TwoSpect Weave $(END_OF_LINE)
+ TwoSpect $(END_OF_LINE)
all: all-recursive
.SUFFIXES:
......@@ -25,9 +25,6 @@ package:
source:
url: {{ url }}
sha256: {{ sha256 }}
patches:
# weave tests are fragile and hardware dependent
- disable-weave-tests.patch
build:
error_overdepending: true
......
# Perform an interpolating search, and compare F-statistics to reference results
test "X${SKIP_TESTS_THAT_FAIL_UNDER_CONDA}" = X || exit 77
export LAL_FSTAT_FFT_PLAN_MODE=ESTIMATE
echo "=== Create search setup with 3 segments spanning ~260 days ==="
......
# Perform a non-interpolating search, and compare F-statistics to reference results
test "X${SKIP_TESTS_THAT_FAIL_UNDER_CONDA}" = X || exit 77
export LAL_FSTAT_FFT_PLAN_MODE=ESTIMATE
echo "=== Create search setup with 3 segments spanning ~3.6 days ==="
......
# Perform a fully-coherent search of a single segment, and compare F-statistics to reference results
test "X${SKIP_TESTS_THAT_FAIL_UNDER_CONDA}" = X || exit 77
export LAL_FSTAT_FFT_PLAN_MODE=ESTIMATE
echo "=== Create single-segment search setup ==="
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment