Enable parallel build

openspur · Nov 11, 2018 · 5122a64 · 5122a64
1 parent 8916793
commit 5122a64
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,8 @@ script:
   - docker build -t yp-spur:xenial -f Dockerfile.test --pull=true --build-arg UBUNTU_VERSION=xenial ${TRAVIS_BUILD_DIR}
   - docker build -t yp-spur:trusty -f Dockerfile.test --pull=true --build-arg UBUNTU_VERSION=trusty ${TRAVIS_BUILD_DIR}
   - docker build -t yp-spur:bionic -f Dockerfile.test --pull=true --build-arg UBUNTU_VERSION=bionic ${TRAVIS_BUILD_DIR}
-  - (mkdir -p ${TRAVIS_BUILD_DIR}/build-win64/install && cd ${TRAVIS_BUILD_DIR}/build-win64 && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-x86_64.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. && make && make install)
-  - (mkdir -p ${TRAVIS_BUILD_DIR}/build-win32/install && cd ${TRAVIS_BUILD_DIR}/build-win32 && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-i686.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. && make && make install)
+  - (mkdir -p ${TRAVIS_BUILD_DIR}/build-win64/install && cd ${TRAVIS_BUILD_DIR}/build-win64 && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-x86_64.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. && make -j && make install)
+  - (mkdir -p ${TRAVIS_BUILD_DIR}/build-win32/install && cd ${TRAVIS_BUILD_DIR}/build-win32 && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-mingw-i686.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/install -DENABLE_ALL_STATIC=ON .. && make -j && make install)
 
 before_deploy:
   - sudo apt-get install -y npm

diff --git a/Dockerfile.test b/Dockerfile.test
@@ -19,14 +19,14 @@ ENV CTEST_OUTPUT_ON_FAILURE=1
 COPY ./ /yp-spur
 RUN mkdir -p /yp-spur/build
 WORKDIR /yp-spur/build
-RUN cmake .. && make && make test && make install
+RUN cmake .. && make -j && make test && make install
 # check that ypspur-interpreter is built without readline
 RUN ldd ypspur-interpreter | grep libreadline.so; test $? -eq 1
 
 RUN apt-get install -y --no-install-recommends libreadline-dev
 
 RUN mkdir -p /yp-spur/build-readline
 WORKDIR /yp-spur/build-readline
-RUN cmake .. && make && make test && make install
+RUN cmake .. && make -j && make test && make install
 # check that ypspur-interpreter is built with readline
 RUN ldd ypspur-interpreter | grep libreadline.so