Skip to content

Commit bdbec77

Browse files
committed
Exclude one more recipe on Intel
Also, pass down definitions in menu.yml to ctest when using dashboard.cmake
1 parent dc8bf92 commit bdbec77

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

.circleci/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ variables:
5656
name: Testing Conda recipes
5757
shell: /bin/bash
5858
command: |
59-
export PATH=/opt/conda/bin:$PATH
6059
pipenv run python testing/collect_tests.py 'chapter-11/recipe-04' &&
6160
pipenv run python testing/collect_tests.py 'chapter-11/recipe-05'
6261

chapter-14/recipe-03/fortran-example/menu.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ travis-osx:
1818
failing_generators:
1919
- 'Ninja'
2020

21+
# ASan not supported by ifort
22+
circle-intel:
23+
skip_generators:
24+
- 'Unix Makefiles'
25+
- 'Ninja'
26+
2127
# error stop is Fortran2008 and PGI is not compliant
2228
circle-pgi:
2329
skip_generators:

testing/collect_tests.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010

1111
import colorama
1212
import docopt
13+
from packaging import version
14+
1315
from env import (die_hard, get_buildflags, get_ci_environment, get_generator,
1416
verbose_output)
15-
from packaging import version
1617
from parse import extract_menu_file
1718

1819

@@ -210,8 +211,9 @@ def run_example(topdir, generator, ci_environment, buildflags, recipe, example):
210211
if dashboard_script_path.exists():
211212
# if this directory contains a dashboard.cmake script, we launch it
212213
step = dashboard_script
213-
command = 'ctest -C {0} -S "{1}" -DCTEST_CMAKE_GENERATOR="{2}"'.format(
214-
configuration, dashboard_script_path, generator)
214+
command = 'ctest -C {0} -S "{1}" -DCTEST_CMAKE_GENERATOR="{2}" {3}'.format(
215+
configuration, dashboard_script_path, generator,
216+
definitions_string)
215217
return_code += run_command(
216218
step=step, command=command, expect_failure=expect_failure)
217219

0 commit comments

Comments
 (0)