On (29/09/15 15:27), Michal Židek wrote:
>On 09/29/2015 03:20 PM, Nikolai Kondrashov wrote:
>>On 09/29/2015 04:03 PM, Lukas Slebodnik wrote:
>>>On (29/09/15 15:47), Nikolai Kondrashov wrote:
>>>>Thank you, Lukas. This is a simple and effective fix.
>>>>
>>>>However, I would prefer that we keep the || on the end of the line,
>>>>rather
>>>>than the start of the next one. Simply because the rest of the CI
>>>>code does
>>>>that.
>>>
>>>I tried to follow convention from other parts of CI script.
>>>However I could not find a multiline test. All tests in CI
>>>script are single line either "[[ sth ]]" or "[ sth ]".
>>>So I decided to use similar was as in C code.
>>
>>Ah, I see.
>>
>>>>If you prefer to have it otherwise, please change it everywhere.
>>>
>>>There's nothig to change or did I I overlook something?
>>>If you still prefer to have || on the end of
>>>the line then I can change it. Just let me know.
>>
>>There are two cases of "||" at the end of the line in commands (not []/[[]]
>>tests) in contrib/ci/run, plus there are two cases of "|" and one of
>>"|&" in
>>other places, which are not the same yet similar.
>>
I was looking for "[[" in contrib script therefore I didn't find it.
The "||" was used in little bit different way.
make distcheck || status=$?
e.g.
status=0
CK_FORK=no \
stage make-check-valgrind \
make-check-wrap -j $CPU_NUM check -- \
libtool --mode=execute \
valgrind-condense 99 \
'!(*.py|*dlopen-tests)' -- \
--trace-children=yes \
--trace-children-skip='*/bin/*,*/sbin/*' \
--leak-check=full \
--gen-suppressions=all \
--suppressions="$CI_DIR/sssd.supp" \
--verbose ||
status=$?
mv "$test_dir" ci-test-dir
((status == 0))
>>If it's all the same to you, I'd rather keep the convention.
>>
>>Thank you.
>>
>>Nick
>
>IMO the || at the beginning is easier to spot (same
>as we use in C), so I would use it that way.
>
Michal, Nikaloi
please decide which way is better. I don't mind any.
LS
_______________________________________________
sssd-devel mailing list
sssd-devel@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
