Set golden image tolerance to 1 to reduce test flakiness caused by minor rendering discrepancies

Author: TheMostDiligent

Tests/ProcessGoldenImages.bat

@@ -13,6 +13,8 @@ set FONT_GREEN=%ESC%[92m
 set FONT_YELLOW=%ESC%[93m
 set FONT_DEFAULT=%ESC%[0m
 
+set GOLDEN_IMAGE_TOLERANCE=1
+
 set num_args=0
 for %%x in (%*) do Set /A num_args+=1
 
@@ -218,7 +220,7 @@ rem For some reason, colored font does not work after the line that starts the s
             rem   !!!   ERRORLEVEL doesn't get updated inside control blocks like IF statements unless           !!!
             rem   !!!   !ERRORLEVEL! is used instead of %ERRORLEVEL% and delayed expansion is enabled as below:  !!!
             rem   !!!   setlocal ENABLEDELAYEDEXPANSION                                                          !!!
-            set cmd_args=!test_mode! --width %GOLDEN_IMAGE_WIDTH% --height %GOLDEN_IMAGE_HEIGHT% --golden_image_mode %golden_img_mode% --capture_path %golden_img_dir% --capture_name !capture_name! --capture_format png --adapters_dialog 0 --break_on_error 0 %extra_args%
+            set cmd_args=!test_mode! --width %GOLDEN_IMAGE_WIDTH% --height %GOLDEN_IMAGE_HEIGHT% --golden_image_mode %golden_img_mode% --capture_path %golden_img_dir% --capture_name !capture_name! --capture_format png --adapters_dialog 0 --break_on_error 0 --golden_image_tolerance %GOLDEN_IMAGE_TOLERANCE% %extra_args%
             echo !app_path! !cmd_args!
             !app_path! !cmd_args!
             rem It is important to save the value of !ERRORLEVEL! so that it is not overridden by further commands

Tests/ProcessGoldenImages.sh

@@ -31,6 +31,8 @@ GREEN='\033[0;32m'
 YELLOW='\033[0;33m'
 NC='\033[0m' # No color
 
+GOLDEN_IMAGE_TOLERANCE=1
+
 if [[ $# -lt 3 ]]; then
     printf "${RED}At least three arguments are required${NC}\n"
     print_help
@@ -186,11 +188,7 @@ function process_golden_img
         if [[ "$skip_test" == "0" ]]; then
             local capture_name="$app_name""_""$backend_name"
 
-            local cmd="$app_path $mode --width $GOLDEN_IMAGE_WIDTH --height $GOLDEN_IMAGE_HEIGHT --golden_image_mode $golden_img_mode --capture_path $golden_img_dir --capture_name $capture_name --capture_format png --adapters_dialog 0 --break_on_error 0 $extra_args"
-            if [[ "$non_separable_progs" != "0" ]]; then
-                # Images generated with non-separable programs may differ slightly.
-                cmd="$cmd --golden_image_tolerance 1"
-            fi
+            local cmd="$app_path $mode --width $GOLDEN_IMAGE_WIDTH --height $GOLDEN_IMAGE_HEIGHT --golden_image_mode $golden_img_mode --capture_path $golden_img_dir --capture_name $capture_name --capture_format png --adapters_dialog 0 --break_on_error 0 --golden_image_tolerance $GOLDEN_IMAGE_TOLERANCE $extra_args"
 
             echo $cmd
             echo ""