0
0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-26 23:01:04 +08:00

Problem: make dist results are not tested (#3024)

* always run tests from tarball of `make dist`

ensures that tests will not pass if critical files are omitted from releases

* add explicit make dist only for non-default builds

distcheck should already cover this for default builds

* don’t verify that valgrind/coverage tests can be run from dists

* add various files missing from dists

- missing template from cmake
- add missing android build files
- add some missing ci_build.sh scripts
This commit is contained in:
Min RK 2018-03-27 18:36:30 +02:00 committed by Luca Boccassi
parent c8a1c4542d
commit 8fb5b10d8a
3 changed files with 19 additions and 0 deletions

View File

@ -944,6 +944,7 @@ EXTRA_DIST = \
autogen.sh \
version.sh \
src/libzmq.pc.cmake.in \
ci_build.sh \
src/libzmq.vers \
src/version.rc.in \
tests/CMakeLists.txt \

View File

@ -15,15 +15,20 @@ EXTRA_DIST = \
cygwin/Makefile.cygwin \
mingw32/Makefile.mingw32 \
mingw32/platform.hpp \
cmake/ci_build.sh \
cmake/Modules \
cmake/NSIS.template32.in \
cmake/NSIS.template64.in \
cmake/ZeroMQConfig.cmake.in \
cmake/clang-format-check.sh.in \
cmake/platform.hpp.in \
valgrind/ci_build.sh \
valgrind/valgrind.supp \
valgrind/vg \
nuget/readme.nuget \
nuget/libzmq.autopkg \
android/Dockerfile \
android/README.md \
android/android_build_helper.sh \
android/ci_build.sh \
android/build.sh

View File

@ -70,5 +70,18 @@ if [ $BUILD_TYPE == "default" ]; then
make VERBOSE=1 -j5 distcheck
) || exit 1
else
# always install custom builds from dist
# to make sure that `make dist` doesn't omit any files required to build & test
# coverage, valgrind are special-case tests that aren't meant to be runnable from releases
if [ ${BUILD_TYPE} != "coverage" ] && [ ${BUILD_TYPE} != "valgrind" ]; then
./autogen.sh
./configure
make -j5 dist-gzip
V=$(./version.sh)
tar -xzf zeromq-$V.tar.gz
cd zeromq-$V
fi
# start the actual build from inside the dist
cd ./builds/${BUILD_TYPE} && ./ci_build.sh
fi