RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-02 18:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: introduce scripts/build-vtest.sh for installing VTest

Browse Source 
we install VTest for all CI systems, let us unify instalation
This commit is contained in:
Ilya Shipitsin 2021-05-15 11:46:15 +05:00 committed by Willy Tarreau
parent 18c7d83934
commit 0b03895620
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.cirrus.yml
View File

@ -6,8 +6,7 @@ FreeBSD_task:
install_script: install_script:
- pkg update -f && pkg upgrade -y && pkg install -y openssl git gmake lua53 socat pcre - pkg update -f && pkg upgrade -y && pkg install -y openssl git gmake lua53 socat pcre
script: script:
- git clone https://github.com/VTest/VTest.git ../vtest - scripts/build-vtest.sh
- make -C ../vtest
- gmake CC=clang V=1 ERR=1 TARGET=freebsd USE_ZLIB=1 USE_PCRE=1 USE_OPENSSL=1 USE_LUA=1 LUA_INC=/usr/local/include/lua53 LUA_LIB=/usr/local/lib LUA_LIB_NAME=lua-5.3 - gmake CC=clang V=1 ERR=1 TARGET=freebsd USE_ZLIB=1 USE_PCRE=1 USE_OPENSSL=1 USE_LUA=1 LUA_INC=/usr/local/include/lua53 LUA_LIB=/usr/local/lib LUA_LIB_NAME=lua-5.3
- ./haproxy -vv - ./haproxy -vv
- ldd haproxy - ldd haproxy

3
.github/workflows/openssl-nodeprecated.yml vendored
View File

@ -23,8 +23,7 @@ jobs:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: prepare VTest - name: prepare VTest
run: | run: |
git clone https://github.com/VTest/VTest.git ../vtest scripts/build-vtest.sh
make -C ../vtest FLAGS="-O2 -s -Wall"
- name: build haproxy - name: build haproxy
run: | run: |
make DEFINE="-DOPENSSL_API_COMPAT=0x10100000L -DOPENSSL_NO_DEPRECATED" -j3 CC=gcc ERR=1 TARGET=linux-glibc USE_OPENSSL=1 make DEFINE="-DOPENSSL_API_COMPAT=0x10100000L -DOPENSSL_NO_DEPRECATED" -j3 CC=gcc ERR=1 TARGET=linux-glibc USE_OPENSSL=1

8
.github/workflows/vtest.yml vendored
View File

@ -60,11 +60,7 @@ jobs:
brew install lua brew install lua
- name: Install VTest - name: Install VTest
run: | run: |
curl -fsSL https://github.com/vtest/VTest/archive/master.tar.gz -o VTest.tar.gz scripts/build-vtest.sh
mkdir VTest
tar xvf VTest.tar.gz -C VTest --strip-components=1
make -C VTest -j$(nproc) FLAGS="-O2 -s -Wall"
sudo install -m755 VTest/vtest /usr/local/bin/vtest
- name: Install SSL ${{ matrix.ssl }} - name: Install SSL ${{ matrix.ssl }}
if: ${{ matrix.ssl && matrix.ssl != 'stock' }} if: ${{ matrix.ssl && matrix.ssl != 'stock' }}
run: env ${{ matrix.ssl }} scripts/build-ssl.sh run: env ${{ matrix.ssl }} scripts/build-ssl.sh
@ -101,7 +97,7 @@ jobs:
- name: Run VTest for HAProxy ${{ steps.show-version.outputs.version }} - name: Run VTest for HAProxy ${{ steps.show-version.outputs.version }}
id: vtest id: vtest
# sudo is required, because macOS fails due to an open files limit. # sudo is required, because macOS fails due to an open files limit.
run: sudo make reg-tests REGTESTS_TYPES=default,bug,devel run: sudo make reg-tests VTEST_PROGRAM=../vtest/vtest REGTESTS_TYPES=default,bug,devel
- name: Show results - name: Show results
if: ${{ failure() }} if: ${{ failure() }}
# The chmod / sudo is necessary due to the `sudo` while running the tests. # The chmod / sudo is necessary due to the `sudo` while running the tests.

4
.travis.yml
View File

@ -38,9 +38,7 @@ matrix:
if: type == cron if: type == cron
install: install:
- git clone https://github.com/VTest/VTest.git ../vtest - scripts/build-vtest.sh
# Special flags due to: https://github.com/vtest/VTest/issues/12
- make -C ../vtest FLAGS="-O2 -s -Wall"
script: script:
- make -j$(nproc) ERR=1 TARGET=linux-glibc CC=$CC DEBUG=-DDEBUG_STRICT=1 $FLAGS - make -j$(nproc) ERR=1 TARGET=linux-glibc CC=$CC DEBUG=-DDEBUG_STRICT=1 $FLAGS

10
scripts/build-vtest.sh Executable file
View File

@ -0,0 +1,10 @@
#!/bin/sh
set -eux
curl -fsSL https://github.com/vtest/VTest/archive/master.tar.gz -o VTest.tar.gz
mkdir ../vtest
tar xvf VTest.tar.gz -C ../vtest --strip-components=1
# Special flags due to: https://github.com/vtest/VTest/issues/12
make -C ../vtest FLAGS="-O2 -s -Wall"