Skip to content

Commit 57f6838

Browse files
authored
Merge pull request simdjson#973 from simdjson/dlemire/testing_static_lib
Because we are dynamic by default, we never test static!
2 parents 3e35729 + 21eff5b commit 57f6838

File tree

2 files changed

+20
-15
lines changed

2 files changed

+20
-15
lines changed

.circleci/config.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
gcc7:
117117
description: Build and run tests on GCC 7 and AVX 2 with a cmake static build
118118
executor: gcc7
119-
environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON }
119+
environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_BUILD_STATIC=ON }
120120
steps: [ install_cmake, cmake_test, cmake_install_test ]
121121
justlib-gcc10:
122122
description: Build just the library, install it and do a basic test
@@ -126,23 +126,23 @@ jobs:
126126
gcc10:
127127
description: Build and run tests on GCC 10 and AVX 2 with a cmake static build
128128
executor: gcc10
129-
environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON }
129+
environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_BUILD_STATIC=ON }
130130
steps: [ cmake_test_all, cmake_install_test ]
131131
clang6:
132132
description: Build and run tests on clang 6 and AVX 2 with a cmake static build
133133
executor: clang6
134-
environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON }
134+
environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_BUILD_STATIC=ON }
135135
steps: [ cmake_test, cmake_install_test ]
136136
clang10:
137137
description: Build and run tests on clang 10 and AVX 2 with a cmake static build
138138
executor: clang10
139-
environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON }
139+
environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_BUILD_STATIC=ON }
140140
steps: [ cmake_test, cmake_install_test ]
141141
# libcpp
142142
libcpp-clang10:
143143
description: Build and run tests on clang 10 and AVX 2 with a cmake static build and libc++
144144
executor: clang10
145-
environment: { CMAKE_FLAGS: -DSIMDJSON_USE_LIBCPP=ON }
145+
environment: { CMAKE_FLAGS: -DSIMDJSON_USE_LIBCPP=ON -DSIMDJSON_BUILD_STATIC=ON }
146146
steps: [ cmake_test, cmake_install_test ]
147147
# sanitize
148148
sanitize-gcc10:
@@ -155,7 +155,7 @@ jobs:
155155
executor: clang10
156156
environment: { CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: -j4 --output-on-failure -E checkperf }
157157
steps: [ cmake_test ]
158-
158+
159159
# dynamic
160160
dynamic-gcc10:
161161
description: Build and run tests on GCC 10 and AVX 2 with a cmake dynamic build
@@ -167,7 +167,7 @@ jobs:
167167
executor: clang10
168168
environment: { CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF }
169169
steps: [ cmake_test, cmake_install_test ]
170-
170+
171171
# unthreaded
172172
unthreaded-gcc10:
173173
description: Build and run tests on GCC 10 and AVX 2 *without* threads
@@ -222,10 +222,10 @@ workflows:
222222
#- gcc10 # this gets tested a lot below
223223
- clang6
224224
#- clang10 # this gets tested a lot below
225-
225+
226226
# libc++
227227
- libcpp-clang10
228-
228+
229229
# full single-implementation tests
230230
- sanitize-gcc10
231231
- sanitize-clang10
@@ -245,6 +245,5 @@ workflows:
245245

246246
# testing "just the library"
247247
- justlib-gcc10
248-
249-
# TODO add windows: https://circleci.com/docs/2.0/configuration-reference/#windows
250248

249+
# TODO add windows: https://circleci.com/docs/2.0/configuration-reference/#windows

.drone.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ steps:
88
CC: gcc
99
CXX: g++
1010
BUILD_FLAGS: -- -j
11+
CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON
1112
CTEST_FLAGS: -j4 --output-on-failure -E checkperf
1213
commands:
1314
- apt-get update -qq
14-
- apt-get install -y cmake
15+
- apt-get install -y cmake
1516
- mkdir build
1617
- cd build
1718
- cmake $CMAKE_FLAGS ..
@@ -33,6 +34,7 @@ steps:
3334
CC: clang-6.0
3435
CXX: clang++-6.0
3536
BUILD_FLAGS: -- -j
37+
CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON
3638
CTEST_FLAGS: -j4 --output-on-failure -E checkperf
3739
commands:
3840
- mkdir build
@@ -59,7 +61,7 @@ steps:
5961
CTEST_FLAGS: -j4 --output-on-failure -E checkperf
6062
commands:
6163
- apt-get update -qq
62-
- apt-get install -y cmake
64+
- apt-get install -y cmake
6365
- mkdir build
6466
- cd build
6567
- cmake $CMAKE_FLAGS ..
@@ -96,10 +98,11 @@ steps:
9698
CC: gcc
9799
CXX: g++
98100
BUILD_FLAGS: -- -j
101+
CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON
99102
CTEST_FLAGS: -j4 --output-on-failure -E checkperf
100103
commands:
101104
- apt-get update -qq
102-
- apt-get install -y cmake
105+
- apt-get install -y cmake
103106
- mkdir build
104107
- cd build
105108
- cmake $CMAKE_FLAGS ..
@@ -144,6 +147,7 @@ steps:
144147
CC: gcc
145148
CXX: g++
146149
BUILD_FLAGS: -- -j
150+
CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON
147151
CTEST_FLAGS: -j4 --output-on-failure -E checkperf
148152
commands:
149153
- apt-get update -qq
@@ -228,6 +232,7 @@ steps:
228232
image: gcc:8
229233
environment:
230234
BUILD_FLAGS: -- -j
235+
CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON
231236
CTEST_FLAGS: -j4 --output-on-failure -E checkperf
232237
CC: gcc
233238
CXX: g++
@@ -278,6 +283,7 @@ steps:
278283
CC: clang-9
279284
CXX: clang++-9
280285
BUILD_FLAGS: -- -j
286+
CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON
281287
CTEST_FLAGS: -j4 --output-on-failure -E checkperf
282288
CXXFLAGS: -stdlib=libc++
283289
commands:
@@ -303,7 +309,7 @@ steps:
303309
CTEST_FLAGS: -j4 --output-on-failure -E checkperf
304310
commands:
305311
- apt-get update -qq
306-
- apt-get install -y cmake
312+
- apt-get install -y cmake
307313
- mkdir build
308314
- cd build
309315
- cmake $CMAKE_FLAGS ..

0 commit comments

Comments
 (0)