Skip to content

Commit 4855af0

Browse files
authored
Merge pull request #3184 from martin-frbg/ctestfix
Fix obscure ctest crashes on OSX and add OSX builds to Azure CI
2 parents b0239a0 + 94a5a1f commit 4855af0

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

azure-pipelines.yml

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,27 @@ jobs:
7474
steps:
7575
- script: |
7676
brew update
77-
make TARGET=CORE2 DYNAMIC_ARCH=1 USE_OPENMP=1 CC=gcc-10 FC=gfortran-10
78-
79-
80-
77+
make TARGET=CORE2 DYNAMIC_ARCH=1 USE_OPENMP=1 INTERFACE64=1 CC=gcc-10 FC=gfortran-10
78+
79+
- job: OSX_GCC_Nothreads
80+
pool:
81+
vmImage: 'macOS-10.15'
82+
steps:
83+
- script: |
84+
brew update
85+
make USE_THREADS=0 CC=gcc-10 FC=gfortran-10
86+
87+
- job: OSX_OpenMP_Clang
88+
pool:
89+
vmImage: 'macOS-10.15'
90+
variables:
91+
LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
92+
LIBRARY_PATH: /usr/local/opt/llvm/lib
93+
steps:
94+
- script: |
95+
brew update
96+
brew install llvm libomp
97+
brew tap LouisBrunner/valgrind
98+
brew install --HEAD LouisBrunner/valgrind/valgrind
99+
make TARGET=SANDYBRIDGE NO_AVX512=1 USE_OPENMP=1 INTERFACE64=1 DYNAMIC_ARCH=1 DYNAMIC_LIST=SANDYBRIDGE DEBUG=1 NO_PARALLEL_MAKE=1 CC=/usr/local/opt/llvm/bin/clang FC=gfortran-10
100+
cd ctest; OMP_NUM_THREADS=1 valgrind ./xscblat2 <sin2

ctest/constant.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include "cblas_test.h"
12
int CBLAS_CallFromC;
23
int RowMajorStrg;
34

0 commit comments

Comments
 (0)