[tarantool-patches] Re: [PATCH v2] travis-ci: fix LTO and clang

Alexander Turenko alexander.turenko at tarantool.org
Mon May 20 18:08:23 MSK 2019


Pushed to master, 2.1 and 1.10.

1.10 has no LTO targets, but I saved CMAKE_EXTRA_PARAMS to keep
CI related files as similar as possible and because we possibly will
need it for GitLab CI targets.

I fixed minor points here and there, see below.

WBR, Alexander Turenko.

On Fri, May 17, 2019 at 04:25:49PM +0300, Alexander V. Tikhonov wrote:
> Made fixes:
> 
> - Added CMAKE_EXTRA_PARAMS environment to docker's container
>   runs to enable -DENABLE_LTO=ON/OFF cmake option.
> 
> - Added CC/CXX environment to docker's container runs to set
>   clang for cmake. Also the additional environment variables
>   {CC,CXX}_FOR_BUILD were not postponed, because we didn't

were postponed? Fixed.

>   run cross-compilation at the moment, for more info check:
> 
>     https://docs.travis-ci.com/user/languages/cpp/#choosing-compilers-to-test-against
> 

> @@ -214,15 +214,17 @@ sql_value_double(sql_value * pVal)
>  bool
>  sql_value_boolean(sql_value *val)
>  {
> -	bool b;
> -	mem_value_bool((struct Mem *) val, &b);
> +	bool b = false;
> +	int rc = mem_value_bool((struct Mem *) val, &b);
> +        assert(rc == 0);
> +        (void) rc;

We use tab symbol for indentation in C sources. Fixed.

> diff --git a/src/httpc.c b/src/httpc.c
> index d8ab27ef0..84bf2413c 100644
> --- a/src/httpc.c
> +++ b/src/httpc.c
> @@ -267,7 +267,8 @@ httpc_set_low_speed_limit(struct httpc_request *req, long low_speed_limit)
>  void
>  httpc_set_verbose(struct httpc_request *req, bool curl_verbose)
>  {
> -	curl_easy_setopt(req->curl_request.easy, CURLOPT_VERBOSE, curl_verbose);
> +	curl_easy_setopt(req->curl_request.easy, CURLOPT_VERBOSE,
> +			(long) curl_verbose);

Added a whitespace to indent '(long) curl_verbose' on the same column
with 'req->curl_request.easy'.

>  }
>  
>  void




More information about the Tarantool-patches mailing list