From 906fec94446aa363bf9e0a6897e6aedfa4773a90 Mon Sep 17 00:00:00 2001
From: Snaipe <franklinmathieu@gmail.com>
Date: Sun, 27 Sep 2015 13:59:40 +0200
Subject: [PATCH] Added parallel building and testing to speed up builds

---
 .travis.yml  | 5 ++---
 appveyor.yml | 7 +++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 621b5a1..48b11f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,9 +35,8 @@ script:
       -DCMAKE_BUILD_TYPE=${CONFIGURATION}
       -DCMAKE_INSTALL_PREFIX=criterion-${TRAVIS_TAG}
       ..
-  - make
-  - make criterion_tests
-  - make test
+  - cmake --build . --target criterion_tests -- -j4
+  - ctest -j4
 
 after_success:
   - make gcov
diff --git a/appveyor.yml b/appveyor.yml
index 1f71d41..318deb8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,8 +15,11 @@ environment:
   matrix:
   - COMPILER: mingw
     GENERATOR: "MSYS Makefiles"
+    BUILD_OPT: -- -j4
   - COMPILER: msvc
     GENERATOR: "Visual Studio 14 2015"
+    CFLAGS: /MP
+    CXXFLAGS: /MP
 
 clone_depth: 5
 
@@ -56,8 +59,8 @@ before_deploy:
         Push-AppveyorArtifact "../$archive.tar.bz2"
 
 test_script:
-  - cmake --build . --target criterion_tests
-  - ps: try { ctest } catch { type Testing/Temporary/LastTest.log }
+  - cmake --build . --target criterion_tests %BUILD_OPT%
+  - ps: try { ctest -j4 } catch { type Testing/Temporary/LastTest.log }
 
 #after_test:
 #  - 'make coveralls'