From 2d83d8ed17ec3fde3182cf9ca0c575bb0db5b2fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=B3th=20B=C3=A9la?= Date: Fri, 14 Sep 2018 13:37:48 +0200 Subject: [PATCH] Fix check-magic-strings.sh to return with non-zero if error happens (#2525) Running `tools/run_tests.py --check-magic-strings` causes an IndexError, but the script exits with 0, indicating error-less run. Added error checking to the file, to indicate errors in the future. Fixes #2522 JerryScript-DCO-1.0-Signed-off-by: Bela Toth tbela@inf.u-szeged.hu --- tools/check-magic-strings.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/check-magic-strings.sh b/tools/check-magic-strings.sh index 23b96e1db..3c8e54dd2 100755 --- a/tools/check-magic-strings.sh +++ b/tools/check-magic-strings.sh @@ -20,13 +20,17 @@ MAGIC_STRINGS_TEMP=`mktemp lit-magic-strings.inc.h.XXXXXXXXXX` cp $MAGIC_STRINGS_INC_H $MAGIC_STRINGS_TEMP $MAGIC_STRINGS_GEN -diff -q $MAGIC_STRINGS_INC_H $MAGIC_STRINGS_TEMP DIFF_RESULT=$? + +if [ $DIFF_RESULT -eq 0 ] +then + diff -q $MAGIC_STRINGS_INC_H $MAGIC_STRINGS_TEMP + DIFF_RESULT=$? + if [ $DIFF_RESULT -ne 0 ] + then + echo -e "\e[1;33m$MAGIC_STRINGS_INC_H must be re-generated. Run $MAGIC_STRINGS_GEN\e[0m" + fi +fi mv $MAGIC_STRINGS_TEMP $MAGIC_STRINGS_INC_H -if [ $DIFF_RESULT -ne 0 ] -then - echo -e "\e[1;33m$MAGIC_STRINGS_INC_H must be re-generated. Run $MAGIC_STRINGS_GEN\e[0m" -fi - exit $DIFF_RESULT