From 6aac08009254909aab3e0359f3ad7ab4e87a91e9 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sun, 14 Mar 2021 14:57:55 +0300 Subject: add `make install`, `make test`, etc. Tests can be called using CTest now. --- .dockerignore | 1 + .github/workflows/ci.yml | 26 ++++++------ .gitignore | 1 + CMakeLists.txt | 1 + Makefile | 89 ++++++++++++++++++++++++++++++++++-------- client/Dockerfile | 14 ++----- cmake | 2 +- server/Dockerfile | 14 ++----- test/benchmarks/CMakeLists.txt | 2 + test/unit_tests/CMakeLists.txt | 2 + 10 files changed, 99 insertions(+), 53 deletions(-) create mode 100644 .gitignore diff --git a/.dockerignore b/.dockerignore index 3becc33..f6edc94 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,6 +4,7 @@ !/3rdparty/** !/CMakeLists.txt !/LICENSE.txt +!/Makefile !/README.md !/client/** !/cmake/** diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc12dcb..ce9c497 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,9 +37,10 @@ jobs: runs-on: '${{ matrix.os }}' name: 'Build: ${{ matrix.os }} / ${{ matrix.toolset }} / ${{ matrix.platform }} / ${{ matrix.configuration }}' env: - toolset: '${{ matrix.toolset }}' - platform: '${{ matrix.platform }}' - configuration: '${{ matrix.configuration }}' + TOOLSET: '${{ matrix.toolset }}' + PLATFORM: '${{ matrix.platform }}' + CONFIGURATION: '${{ matrix.configuration }}' + BOOST_VERSION: 1.71.0 defaults: run: shell: pwsh @@ -52,22 +53,17 @@ jobs: uses: actions/setup-python@v2 with: python-version: '3.x' + - name: Build Boost + run: make deps - name: Build - run: | - cd cmake - python -m project.ci.github.cmake --install -- -D MATH_SERVER_TESTS=ON - - name: Upload the binaries + run: make install + - name: Upload binaries uses: actions/upload-artifact@v2 with: name: 'math-server-${{ matrix.os }}-${{ matrix.toolset }}-${{ matrix.platform }}-${{ matrix.configuration }}' - path: '${{ runner.workspace }}/install/' - - name: Run unit tests - run: ../install/bin/math-server-unit-tests - - name: Run the benchmarks - run: ../install/bin/math-server-benchmarks - - name: Run the stress test - run: ./test/stress_test.sh ../install - if: runner.os == 'Linux' + path: '${{ runner.workspace }}/build/install/' + - name: Test + run: make test publish: needs: [lint] diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0e03e15 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.build/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 8362ad2..f68e3c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.8) # for C++17 project(math_server CXX) +enable_testing() option(MATH_SERVER_TESTS "build the tests") # C++17 is mandatory: diff --git a/Makefile b/Makefile index f192725..13dfc3e 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ # Basically a collection of really small shell scripts. MAKEFLAGS += --warn-undefined-variables +unexport MAKEFLAGS .DEFAULT_GOAL := all .DELETE_ON_ERROR: .SUFFIXES: @@ -11,16 +12,6 @@ SHELL := bash .PHONY: DO DO: -PROJECT := math-server -# Enable buildx support: -export DOCKER_CLI_EXPERIMENTAL := enabled -# Target platforms (used by buildx): -PLATFORMS := linux/amd64,linux/armhf -# In case buildx isn't installed (e.g. on Ubuntu): -BUILDX_VERSION := v0.4.2 -# Docker Hub credentials: -DOCKER_USERNAME := egortensin - escape = $(subst ','\'',$(1)) define noexpand @@ -35,14 +26,75 @@ ifeq ($$(origin $(1)),command line) endif endef +PROJECT := math-server +TOOLSET ?= auto +CONFIGURATION ?= Debug +BOOST_VERSION ?= 1.72.0 +BOOST_LIBRARIES := --with-filesystem --with-program_options --with-regex --with-test +CMAKE_FLAGS ?= + +this_dir := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) +src_dir := $(this_dir) +ifdef CI +build_dir := $(this_dir)../build +else +build_dir := $(this_dir).build +endif +boost_dir := $(build_dir)/boost +cmake_dir := $(build_dir)/cmake +DESTDIR ?= $(build_dir)/install + +# Enable buildx support: +export DOCKER_CLI_EXPERIMENTAL := enabled +# Target platforms (used by buildx): +DOCKER_PLATFORMS := linux/amd64,linux/armhf +# In case buildx isn't installed (e.g. on Ubuntu): +BUILDX_VERSION := v0.4.2 +# Docker Hub credentials: +DOCKER_USERNAME := egortensin + +$(eval $(call noexpand,TOOLSET)) +$(eval $(call noexpand,CONFIGURATION)) +$(eval $(call noexpand,BOOST_VERSION)) +$(eval $(call noexpand,CMAKE_FLAGS)) ifdef DOCKER_PASSWORD $(eval $(call noexpand,DOCKER_PASSWORD)) endif - -curl := curl --silent --show-error --location --dump-header - --connect-timeout 20 +$(eval $(call noexpand,DESTDIR)) .PHONY: all -all: docker/build +all: build + +.PHONY: clean +clean: + rm -rf -- '$(call escape,$(build_dir))' + +$(boost_dir)/: + cd cmake && python3 -m project.boost.download --cache '$(call escape,$(build_dir))' -- '$(call escape,$(BOOST_VERSION))' '$(call escape,$(boost_dir))' + +.PHONY: deps +ifdef CI +deps: + cd cmake && python3 -m project.ci.boost -- $(BOOST_LIBRARIES) +else +deps: $(boost_dir)/ + cd cmake && python3 -m project.boost.build --toolset '$(call escape,$(TOOLSET))' --configuration '$(call escape,$(CONFIGURATION))' -- '$(call escape,$(boost_dir))' $(BOOST_LIBRARIES) +endif + +.PHONY: build +build: +ifdef CI + cd cmake && python3 -m project.ci.cmake --install -- -D MATH_SERVER_TESTS=ON $(CMAKE_FLAGS) +else + cd cmake && python3 -m project.cmake.build --toolset '$(call escape,$(TOOLSET))' --configuration '$(call escape,$(CONFIGURATION))' --build '$(call escape,$(cmake_dir))' --install '$(call escape,$(DESTDIR))' --boost '$(call escape,$(boost_dir))' -- '$(call escape,$(src_dir))' -D MATH_SERVER_TESTS=ON $(CMAKE_FLAGS) +endif + +.PHONY: install +install: build + +.PHONY: test +test: + cd -- '$(call escape,$(cmake_dir))' && ctest -C '$(call escape,$(CONFIGURATION))' --verbose .PHONY: docker/login docker/login: @@ -109,10 +161,13 @@ compose/push: docker/check-push compose/build # The simple way to build multiarch repos is `docker buildx`. +binfmt_image := docker/binfmt:66f9012c56a8316f9244ffd7622d7c21c1f6f28d + .PHONY: fix-binfmt -# Re-register binfmt_misc formats with the F flag (required e.g. on Bionic): fix-binfmt: - docker run --rm --privileged docker/binfmt:66f9012c56a8316f9244ffd7622d7c21c1f6f28d + docker run --rm --privileged '$(call escape,$(binfmt_image))' + +curl := curl --silent --show-error --location --dump-header - --connect-timeout 20 buildx_url := https://github.com/docker/buildx/releases/download/$(BUILDX_VERSION)/buildx-$(BUILDX_VERSION).linux-amd64 @@ -131,13 +186,13 @@ buildx/rm: docker buildx rm '$(call escape,$(PROJECT))_builder' buildx/build/%: DO - docker buildx build -f '$*/Dockerfile' -t '$(call escape,$(DOCKER_USERNAME))/math-$*' --platform '$(call escape,$(PLATFORMS))' --progress plain . + docker buildx build -f '$*/Dockerfile' -t '$(call escape,$(DOCKER_USERNAME))/math-$*' --platform '$(call escape,$(DOCKER_PLATFORMS))' --progress plain . .PHONY: buildx/build buildx/build: buildx/build/client buildx/build/server buildx/push/%: DO - docker buildx build -f '$*/Dockerfile' -t '$(call escape,$(DOCKER_USERNAME))/math-$*' --platform '$(call escape,$(PLATFORMS))' --progress plain --push . + docker buildx build -f '$*/Dockerfile' -t '$(call escape,$(DOCKER_USERNAME))/math-$*' --platform '$(call escape,$(DOCKER_PLATFORMS))' --progress plain --push . .PHONY: buildx/push buildx/push: buildx/push/client buildx/push/server diff --git a/client/Dockerfile b/client/Dockerfile index c2969ea..2d6e1c2 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -8,22 +8,16 @@ FROM base AS builder ENV src_dir=/usr/src/math-server COPY [".", "$src_dir"] -RUN build_deps='boost-dev cmake g++ make python3' && \ +RUN build_deps='bash boost-dev cmake g++ make python3' && \ apk add --no-cache $build_deps && \ - cd -- "$src_dir/cmake" && \ - python3 -m project.cmake.build \ - --install /opt/math-server \ - --configuration Release \ - -- \ - "$src_dir" \ - -D MATH_SERVER_TESTS=ON \ - -D Boost_USE_STATIC_LIBS=OFF + cd -- "$src_dir" && \ + make install CONFIGURATION=Release CMAKE_FLAGS='-D Boost_USE_STATIC_LIBS=OFF' FROM base LABEL maintainer="Egor Tensin " -COPY --from=builder ["/opt/math-server", "/opt/math-server"] +COPY --from=builder ["/usr/src/math-server/.build/install", "/opt/math-server"] RUN runtime_deps='boost-filesystem boost-program_options boost-regex boost-unit_test_framework libstdc++' && \ apk add $runtime_deps && \ diff --git a/cmake b/cmake index d4673a2..e5de0b1 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit d4673a2ff058529488dddf2e0520ee68ec88a0c7 +Subproject commit e5de0b18453dd2fb3bf3e02414ee00ee185d81d6 diff --git a/server/Dockerfile b/server/Dockerfile index f19c283..c243edd 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -8,22 +8,16 @@ FROM base AS builder ENV src_dir=/usr/src/math-server COPY [".", "$src_dir"] -RUN build_deps='boost-dev cmake g++ make python3' && \ +RUN build_deps='bash boost-dev cmake g++ make python3' && \ apk add --no-cache $build_deps && \ - cd -- "$src_dir/cmake" && \ - python3 -m project.cmake.build \ - --install /opt/math-server \ - --configuration Release \ - -- \ - "$src_dir" \ - -D MATH_SERVER_TESTS=ON \ - -D Boost_USE_STATIC_LIBS=OFF + cd -- "$src_dir" && \ + make install CONFIGURATION=Release CMAKE_FLAGS='-D Boost_USE_STATIC_LIBS=OFF' FROM base LABEL maintainer="Egor Tensin " -COPY --from=builder ["/opt/math-server", "/opt/math-server"] +COPY --from=builder ["/usr/src/math-server/.build/install", "/opt/math-server"] RUN runtime_deps='boost-filesystem boost-program_options boost-regex boost-unit_test_framework libstdc++' && \ apk add $runtime_deps && \ diff --git a/test/benchmarks/CMakeLists.txt b/test/benchmarks/CMakeLists.txt index 0e168cc..c81a520 100644 --- a/test/benchmarks/CMakeLists.txt +++ b/test/benchmarks/CMakeLists.txt @@ -10,3 +10,5 @@ install(TARGETS benchmarks RUNTIME DESTINATION bin) if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") install(FILES "$" DESTINATION bin OPTIONAL) endif() + +add_test(NAME benchmarks COMMAND benchmarks --benchmark_color=false) diff --git a/test/unit_tests/CMakeLists.txt b/test/unit_tests/CMakeLists.txt index 099fc2c..7669e30 100644 --- a/test/unit_tests/CMakeLists.txt +++ b/test/unit_tests/CMakeLists.txt @@ -11,3 +11,5 @@ install(TARGETS unit_tests RUNTIME DESTINATION bin) if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") install(FILES "$" DESTINATION bin OPTIONAL) endif() + +add_test(NAME unit_tests COMMAND unit_tests --no_color_output) -- cgit v1.2.3