[clang-tools-extra] r212546 - Use explicit if and restore lost FileCheck error code checking.

[Alexander Kornienko]

I assume, ensured this script still works by simulating a test failure?


On Tue, Jul 8, 2014 at 6:15 PM, Benjamin Kramer <benny.kra at googlemail.com>
wrote:

> Author: d0k
> Date: Tue Jul  8 11:15:48 2014
> New Revision: 212546
>
> URL: http://llvm.org/viewvc/llvm-project?rev=212546&view=rev
> Log:
> Use explicit if and restore lost FileCheck error code checking.
>
> Modified:
>     clang-tools-extra/trunk/test/clang-tidy/check_clang_tidy_fix.sh
>
> Modified: clang-tools-extra/trunk/test/clang-tidy/check_clang_tidy_fix.sh
> URL:
> http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-tidy/check_clang_tidy_fix.sh?rev=212546&r1=212545&r2=212546&view=diff
>
> ==============================================================================
> --- clang-tools-extra/trunk/test/clang-tidy/check_clang_tidy_fix.sh
> (original)
> +++ clang-tools-extra/trunk/test/clang-tidy/check_clang_tidy_fix.sh Tue
> Jul  8 11:15:48 2014
> @@ -8,5 +8,7 @@ TEMPORARY_FILE=$3.cpp
>
>  grep -Ev "// *[A-Z-]+:" ${INPUT_FILE} > ${TEMPORARY_FILE}
>  clang-tidy ${TEMPORARY_FILE} -fix --checks="-*,${CHECK_TO_RUN}" --
> --std=c++11 > ${TEMPORARY_FILE}.msg 2>&1
> -FileCheck -input-file=${TEMPORARY_FILE} ${INPUT_FILE} -strict-whitespace
> -not grep CHECK-MESSAGES ${INPUT_FILE} || FileCheck
> -input-file=${TEMPORARY_FILE}.msg ${INPUT_FILE} -check-prefix=CHECK-MESSAGES
> +FileCheck -input-file=${TEMPORARY_FILE} ${INPUT_FILE} -strict-whitespace
> || exit $?
> +if grep CHECK-MESSAGES ${INPUT_FILE}; then
> +  FileCheck -input-file=${TEMPORARY_FILE}.msg ${INPUT_FILE}
> -check-prefix=CHECK-MESSAGES || exit $?
> +fi
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20140708/de6f06fb/attachment.html>