Merge pull request simdjson#1167 from simdjson/jkeiser/isolate-checkperf-more

jkeiser · web-flow · commit 8cef02e8e89a · 2020-09-11T11:58:37.000-07:00
Isolate checkperf more
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -85,18 +85,21 @@ commands:
     steps:
       - cmake_build
       - run: |
-          cd build && tools/json2json -h &&
+          cd build &&
+          tools/json2json -h &&
           ctest $CTEST_FLAGS -L acceptance &&
           ctest $CTEST_FLAGS -LE acceptance -E checkperf
 
   cmake_test_all:
     steps:
       - cmake_build
       - run: |
-          cd build &&  tools/json2json -h &&
+          cd build &&
+          tools/json2json -h &&
           ctest $CTEST_FLAGS -L acceptance -LE per_implementation &&
-          SIMDJSON_FORCE_IMPLEMENTATION=haswell ctest $CTEST_FLAGS -L per_implementation &&
-          SIMDJSON_FORCE_IMPLEMENTATION=westmere ctest $CTEST_FLAGS -L per_implementation &&SIMDJSON_FORCE_IMPLEMENTATION=fallback ctest $CTEST_FLAGS -L per_implementation &&
+          SIMDJSON_FORCE_IMPLEMENTATION=haswell ctest $CTEST_FLAGS -L per_implementation -E checkperf &&
+          SIMDJSON_FORCE_IMPLEMENTATION=westmere ctest $CTEST_FLAGS -L per_implementation -E checkperf &&
+          SIMDJSON_FORCE_IMPLEMENTATION=fallback ctest $CTEST_FLAGS -L per_implementation -E checkperf &&
           ctest $CTEST_FLAGS -LE "acceptance|per_implementation" # Everything we haven't run yet, run now.
 
 
@@ -106,7 +109,7 @@ commands:
       - run: |
           cmake --build  build --target checkperf &&
           cd build && 
-          ctest --output-on-failure -R checkperf 
+          ctest --output-on-failure -R checkperf
 
   # we not only want cmake to build and run tests, but we want also a successful installation from which we can build, link and run programs
   cmake_install_test: # this version builds, install, test and then verify from the installation
diff --git a/.drone.yml b/.drone.yml
@@ -326,7 +326,7 @@ steps:
     CXX: clang++-9
     BUILD_FLAGS: -- -j 4
     CMAKE_FLAGS: -GNinja -DSIMDJSON_BUILD_STATIC=ON
-    CTEST_FLAGS: -j4 --output-on-failure
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
     CXXFLAGS: -stdlib=libc++
   commands:
     - apt-get update -qq
