[Tarantool-patches] [PATCH v2 10/10] test: disable test/lua-Harness-tests/241-standalone.t on FreeBSD

Igor Munkin imun at tarantool.org
Mon Jul 26 23:13:58 MSK 2021


Max,

Thanks for the fixes! LGTM, except a single typo.

On 26.07.21, Максим Корякшин wrote:
> 
> Sorry for the several emails, I have encountered some issues with the email client.
>  
> Anyway, here is the diff, that masks only one particular assertion instead of masking all of them:
> ========================================================================
> diff --git a/test/lua-Harness-tests/241-standalone.t b/test/lua-Harness-tests/241-standalone.t
> index d5373b9f..bdd95514 100755
> --- a/test/lua-Harness-tests/241-standalone.t
> +++ b/test/lua-Harness-tests/241-standalone.t
> @@ -51,10 +51,6 @@ if not pcall(io.popen, lua .. [[ -e "a=1"]]) then
>      skip_all "io.popen not supported"
>  end
> -if jit.os == 'BSD' then
> -    skip_all "BSD is not supported yet"
> -end
> -
>  plan'no_plan'
>  diag(lua)
> @@ -116,22 +112,24 @@ f = io.popen(cmd)
>  equals(f:read'*l', 'Hello World', "redirect")
>  f:close()
> -cmd = lua .. " -i hello-241.lua < hello-241.lua 2>&1"
> -f = io.popen(cmd)
> -matches(f:read'*l', banner, "-i")
> -if ujit then
> -    matches(f:read'*l', '^JIT:')
> -end
> -if ravi then
> -    matches(f:read'*l', '^Copyright %(C%)')
> -    matches(f:read'*l', '^Portions Copyright %(C%)')
> -    matches(f:read'*l', '^Options')
> -end
> -if _TARANTOOL then
> -    matches(f:read'*l', "^type 'help' for interactive help")
> +if jit.os ~= 'BSD' then
> +    cmd = lua .. " -i hello-241.lua < hello-241.lua 2>&1"
> +    f = io.popen(cmd)
> +    matches(f:read'*l', banner, "-i")
> +    if ujit then
> +        matches(f:read'*l', '^JIT:')
> +    end
> +    if ravi then
> +        matches(f:read'*l', '^Copyright %(C%)')
> +        matches(f:read'*l', '^Portions Copyright %(C%)')
> +        matches(f:read'*l', '^Options')
> +    end
> +    if _TARANTOOL then
> +        matches(f:read'*l', "^type 'help' for interactive help")
> +    end
> +    equals(f:read'*l', 'Hello World')
> +    f:close()
>  end
> -equals(f:read'*l', 'Hello World')
> -f:close()
>  cmd = lua .. [[ -e"a=1" -e "print(a)"]]
>  f = io.popen(cmd)
> ========================================================================
>  
> And here is the fixed commit message:
> ========================================================================
>     test: disable 241-standalone.t on FreeBSD
>  
>     Tarantool interactive mode misbehaviour has been found on
>     FreeBSD (for more info see tarantool/tarantool#6231). Hence, this[1]
>     particular assertion is masked for FreeBSD until the mentioned issue
>     resolves.

Typo: s/resolves/is resolved/.

>  
>     [1]:  https://framagit.org/fperrad/lua-Harness/-/blob/master/test_lua/241-standalone.t#L115-130
>  
>     Part of tarantool/tarantool#5970
>     Part of tarantool/tarantool#4473
>     Relates to tarantool/tarantool#6231
>  
> ========================================================================
>   

<snipped>

>  

-- 
Best regards,
IM


More information about the Tarantool-patches mailing list