Skip to content

Commit 7f27e1e

Browse files
lemirelemire
committed
Merge branch 'master' of github.com:lemire/simdjson
2 parents 5c538dd + 875e2f9 commit 7f27e1e

File tree

17 files changed

+487
-124
lines changed

17 files changed

+487
-124
lines changed

‎.appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ build_script:
1919
- cd build
2020
- ps: cmake -DSIMDJSON_BUILD_STATIC="$env:SIMDJSON_BUILD_STATIC" -DCMAKE_BUILD_TYPE=Release -DCMAKE_GENERATOR_PLATFORM=x64 ..
2121
- cmake --build .
22-
- ctest --verbose
22+
- ctest --verbose --output-on-failure

‎.circleci/config.yml‎

Lines changed: 125 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,46 @@ jobs:
2525
command: make quiettest amalgamate
2626

2727
- run:
28-
name: Building (gcc, cmake)
28+
name: Building (gcc, cmake, dynamic)
2929
command: |
3030
mkdir build
3131
cd build
32-
cmake ..
32+
cmake -DSIMDJSON_BUILD_STATIC=OFF ..
3333
make
3434
3535
- run:
36-
name: Running tests (gcc, cmake)
36+
name: Running tests (gcc, cmake, dynamic)
3737
command: |
3838
cd build
3939
make test
4040
41+
- run:
42+
name: Building (gcc, cmake, static)
43+
command: |
44+
mkdir buildstatic
45+
cd buildstatic
46+
cmake -DSIMDJSON_BUILD_STATIC=ON ..
47+
make
48+
49+
- run:
50+
name: Running tests (gcc, cmake, static)
51+
command: |
52+
cd buildstatic
53+
make test
54+
- run:
55+
name: Building (gcc, cmake, sanitize)
56+
command: |
57+
mkdir buildsani
58+
cd buildsani
59+
cmake -DSIMDJSON_SANITIZE=ON -DSIMDJSON_BUILD_STATIC=OFF ..
60+
make
61+
62+
- run:
63+
name: Running tests (gcc, cmake, sanitize)
64+
command: |
65+
cd buildsani
66+
make test
67+
4168
"gccnoavx":
4269
docker:
4370
- image: ubuntu:18.04
@@ -63,19 +90,46 @@ jobs:
6390
command: ARCHFLAGS="-march=nehalem" make quiettest amalgamate
6491

6592
- run:
66-
name: Building (gcc, cmake)
93+
name: Building (gcc, cmake, dynamic)
6794
command: |
6895
mkdir build
6996
cd build
70-
cmake -DSIMDJSON_DISABLE_AVX=on ..
97+
cmake -DSIMDJSON_DISABLE_AVX=ON -DSIMDJSON_BUILD_STATIC=OFF ..
7198
make
7299
73100
- run:
74-
name: Running tests (gcc, cmake)
101+
name: Running tests (gcc, cmake, dynamic)
75102
command: |
76103
cd build
77104
make test
78105
106+
- run:
107+
name: Building (gcc, cmake, static)
108+
command: |
109+
mkdir buildstatic
110+
cd buildstatic
111+
cmake -DSIMDJSON_DISABLE_AVX=ON -DSIMDJSON_BUILD_STATIC=ON ..
112+
make
113+
114+
- run:
115+
name: Running tests (gcc, cmake, static)
116+
command: |
117+
cd buildstatic
118+
make test
119+
120+
- run:
121+
name: Building (gcc, cmake, sanitize)
122+
command: |
123+
mkdir buildsani
124+
cd buildsani
125+
cmake -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_DISABLE_AVX=ON -DSIMDJSON_SANITIZE=ON ..
126+
make
127+
128+
- run:
129+
name: Running tests (gcc, cmake, sanitize)
130+
command: |
131+
cd buildsani
132+
make test
79133
"clang":
80134
docker:
81135
- image: ubuntu:18.04
@@ -101,19 +155,47 @@ jobs:
101155
command: make quiettest amalgamate
102156

103157
- run:
104-
name: Building (clang, cmake)
158+
name: Building (clang, cmake, dynamic)
105159
command: |
106160
mkdir build
107161
cd build
108-
cmake ..
162+
cmake -DSIMDJSON_BUILD_STATIC=OFF ..
109163
make
110164
111165
- run:
112-
name: Running tests (clang, cmake)
166+
name: Running tests (clang, cmake, dynamic)
113167
command: |
114168
cd build
115169
make test
116170
171+
- run:
172+
name: Building (clang, cmake, static)
173+
command: |
174+
mkdir buildstatic
175+
cd buildstatic
176+
cmake -DSIMDJSON_BUILD_STATIC=ON ..
177+
make
178+
179+
- run:
180+
name: Running tests (clang, cmake, static)
181+
command: |
182+
cd buildstatic
183+
make test
184+
185+
- run:
186+
name: Building (clang, cmake, sanitize)
187+
command: |
188+
mkdir buildsani
189+
cd buildsani
190+
cmake -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON ..
191+
make
192+
193+
- run:
194+
name: Running tests (clang, cmake, sanitize)
195+
command: |
196+
cd buildsani
197+
make test
198+
117199
"clangnoavx":
118200
docker:
119201
- image: ubuntu:18.04
@@ -139,24 +221,54 @@ jobs:
139221
command: ARCHFLAGS="-march=nehalem" make quiettest amalgamate
140222

141223
- run:
142-
name: Building (clang, cmake)
224+
name: Building (clang, cmake, dynamic)
143225
command: |
144226
mkdir build
145227
cd build
146-
cmake -DSIMDJSON_DISABLE_AVX=on ..
228+
cmake -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_DISABLE_AVX=on ..
147229
make
148230
149231
- run:
150-
name: Running tests (clang, cmake)
232+
name: Running tests (clang, cmake, dynamic)
151233
command: |
152234
cd build
153235
make test
154236
237+
238+
- run:
239+
name: Building (clang, cmake, static)
240+
command: |
241+
mkdir buildstatic
242+
cd buildstatic
243+
cmake -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_DISABLE_AVX=on ..
244+
make
245+
246+
- run:
247+
name: Running tests (clang, cmake, static)
248+
command: |
249+
cd buildstatic
250+
make test
251+
252+
253+
- run:
254+
name: Building (clang, cmake, sanitize)
255+
command: |
256+
mkdir buildsani
257+
cd buildsani
258+
cmake -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_DISABLE_AVX=ON -DSIMDJSON_SANITIZE=ON ..
259+
make
260+
261+
- run:
262+
name: Running tests (clang, cmake, sanitize)
263+
command: |
264+
cd buildsani
265+
make test
266+
155267
workflows:
156268
version: 2
157269
build_and_test:
158270
jobs:
159271
- "clang"
160272
- "gcc"
161273
- "clangnoavx"
162-
- "gccnoavx"
274+
- "gccnoavx"

0 commit comments

Comments
 (0)