here's "v2"
ср, 24 апр. 2019 г. в 18:56, Илья Шипицин <chipits...@gmail.com>:
> I can test myself and send "v2" in couple of hours if you do not mind
>
> ср, 24 апр. 2019 г. в 18:48, Tim Düsterhus <t...@bastelstu.be>:
>
>> Willy,
>> Ilya,
>>
>> I'm not in the office today and can only test it myself starting
>> tomorrow, but what Ilya says should be correct:
>>
>> My v2 patch in this thread can be applied without the
>>
>> env: TARGET=linux2628 FLAGS="USE_ZLIB=1 USE_PCRE=1 USE_LUA=1
>> USE_OPENSSL=1"
>>
>> line in allow_failures. The os: osx line needs to remain for now, because
>> of some non-regression failures in the reg tests.
>>
>> Best regards
>> Tim Düsterhus
>>
>> Am 24.04.2019 15:06 schrieb Илья Шипицин <chipits...@gmail.com>:
>>
>> I'd accept "Extend .travis.yml" patch except "allow_failures"
>>
>> Tim, do you mind to send "v2" ?
>>
>> ср, 24 апр. 2019 г. в 17:45, Willy Tarreau <w...@1wt.eu>:
>>
>> Hi Ilya,
>>
>> On Tue, Apr 23, 2019 at 09:37:27PM +0200, Willy Tarreau wrote:
>> > On Wed, Apr 24, 2019 at 12:30:36AM +0500, ???? ??????? wrote:
>> > > >
>> http://git.haproxy.org/?p=haproxy.git;a=commit;h=333939c2eee8f9dbfe11f66073e52892b38347e7
>> > > >
>> > > > This one was just found and fixed by Fred. Just pushed as commit
>> bed883ab.
>> > > >
>> > >
>> > > there're seem to be more regressions. I can run newest reg-tests
>> against
>> > > parent of that commit, but they fail on bed883ab
>> >
>> > OK. Thank you Ilya. At this point I have no idea since I don't see
>> > these ones.
>>
>> So now in addition to Fred's fix above, we have an early close fixed by
>> Christopher yesterday evening, the SSL issues fixes today by Olivier and
>> the deadlock on round-robin that I just fixed. And the tests now report
>> a success :
>>
>> https://travis-ci.com/haproxy/haproxy/builds/109434799
>>
>> So we're getting better it seems! I'll let you and Tim determine what
>> needs to be adjusted/improved in the travis config file for next steps.
>>
>> Cheers,
>> Willy
>>
>>
>>
From 692cad791e011177ac5afe006ef5b40102cc4cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= <t...@bastelstu.be>
Date: Wed, 24 Apr 2019 19:11:09 +0500
Subject: [PATCH] This commit extends the Travis CI configuration to build
HAProxy with gcc on Linux, clang on Mac and cleans up the build flag
configuration to be easier extendable.
Note: At the moment HAProxy fails on Travis for configurations
- on OS X
---
.travis.yml | 44 ++++++++++++++++++++++++++++++++++----------
1 file changed, 34 insertions(+), 10 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c8937f37..50428602 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,22 +3,46 @@ dist: xenial
language: c
+addons:
+ apt:
+ packages: [ liblua5.3-dev ]
+
matrix:
include:
-# - os: linux
-# compiler: gcc
-# env: TARGET=linux2628
+ - os: linux
+ compiler: gcc
+ env: TARGET=linux2628 FLAGS=
+ - os: linux
+ compiler: gcc
+ env: TARGET=linux2628 FLAGS="USE_ZLIB=1 USE_PCRE=1 USE_LUA=1 USE_OPENSSL=1"
- os: linux
compiler: clang
- env: TARGET=linux2628 USE_THREAD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_GETADDRINFO=1
-# - os: osx
-# compiler: clang
-# env: TARGET=osx SSL_LIB=/usr/local/opt/openssl/lib SSL_INC=/usr/local/opt/openssl/include TMPDIR=/var/tmp
+ env: TARGET=linux2628 FLAGS=
+ - os: osx
+ compiler: clang
+ env: TARGET=generic FLAGS=
+ allow_failures:
+ - os: osx
install:
- git clone https://github.com/VTest/VTest.git ../vtest
- - make -C ../vtest
+ # Special flags due to: https://github.com/vtest/VTest/issues/12
+ - make -C ../vtest FLAGS="-O2 -s -Wall"
+
+before_script:
+ # This is a fix for the super long TMPDIR on Mac making
+ # the unix socket path names exceed the maximum allowed
+ # length.
+ - sed -i'.original' '/TESTDIR=.*haregtests/s/haregtests-.*XXXXXX/regtest.XXX/' scripts/run-regtests.sh
script:
- - make CC=$CC V=1 TARGET=$TARGET USE_THREAD=${USE_THREAD} USE_OPENSSL=${USE_OPENSSL} USE_PCRE=${USE_PCRE} USE_ZLIB=${USE_ZLIB} USE_GETADDRINFO=${USE_GETADDRINFO}
- - make reg-tests PATH=${PATH}:${PWD}/../vtest VTEST_PROGRAM="../vtest/vtest -v"
+ - make CC=$CC V=1 TARGET=$TARGET $FLAGS
+ - ./haproxy -vv
+ - env VTEST_PROGRAM=../vtest/vtest make reg-tests
+
+after_failure:
+ - |
+ for folder in ${TMPDIR:-/tmp}/*regtest*/vtc.*; do
+ cat $folder/INFO
+ cat $folder/LOG
+ done
--
2.20.1
