Directly set err_out, fix bug with accepted/failed

Author: rien

integration-tests/run

@@ -5,7 +5,7 @@ shopt -s globstar
 # Default values
 target_dir="integration-tests"
 overwrite=0
-verbose=0
+err_out="/dev/null"
 
 # Parse arguments
 while [ "$#" -gt 0 ]; do
@@ -14,7 +14,7 @@ while [ "$#" -gt 0 ]; do
             overwrite=1
             ;;
         -v|--verbose)
-            verbose=1
+            err_out="/dev/stderr"
             ;;
         *)
             target_dir="$1"
@@ -30,11 +30,6 @@ description_changed=0
 minor_change=0
 major_change=0
 
-err_out="/dev/null"
-if [ $verbose -gt 0 ]; then
-    err_out="/dev/stderr"
-fi
-
 # Find all config.json files in target directory
 for config in $target_dir/**/config.json; do
     test_dir="$(dirname "$config")"
@@ -90,31 +85,30 @@ for config in $target_dir/**/config.json; do
     rm -r "$workdir"
 
     # Count accepted and failed in output
-    accepted_output="$(echo "$output" | jq -s 'map(select(.accepted == true)) | length')"
-    failed_output="$(echo "$output" | jq -s 'map(select(.accepted == false)) | length')"
-    echo -en "$accepted_output accepted, $failed_output failed\t"
+    accepted_actual="$(echo "$output" | jq -s 'map(select(.accepted == true)) | length')"
+    failed_actual="$(echo "$output" | jq -s 'map(select(.accepted == false)) | length')"
+    echo -en "$accepted_actual accepted, $failed_actual failed\t"
 
 
 
     if [ -f "$result_file" ]; then
         # Count accepted and failed in result
-        accepted_result="$(jq -s 'map(select(.accepted == true)) | length' "$result_file" )"
-        failed_result="$(jq -s 'map(select(.accepted == true)) | length' "$result_file" )"
-
+        accepted_expected="$(jq -s 'map(select(.accepted == true)) | length' "$result_file" )"
+        failed_expected="$(jq -s 'map(select(.accepted == false)) | length' "$result_file" )"
 
         # First check if files are exact using diff, then check if they differ except '.description', then check they differ in accepted or failed
 
         if diff -c "$result_file" <(echo "$output") > "$err_out"; then
             echo "[EXACT MATCH]"
             exact_match=$((exact_match + 1))
-        elif diff -c <(jq "del(.description)" "$result_file") <(echo "$output" | jq "del(.description)") > "$err_out"; then
+        elif diff -c <(jq "del(.description)" "$result_file") <(echo "$output" | jq "del(.description)") > /dev/null; then
             echo "[DESCRIPTION CHANGED]"
             description_changed=$((description_changed + 1))
-        elif [ "$accepted_output" -eq "$accepted_result" ] && [ "$failed_output" -eq "$failed_result" ]; then
+        elif [ "$accepted_actual" -eq "$accepted_expected" ] && [ "$failed_actual" -eq "$failed_expected" ]; then
             echo "[MINOR CHANGE] (accepted/failed unchanged)"
             minor_change=$((minor_change + 1))
         else
-            echo "[MAJOR CHANGE] (accepted/failed changed, was $accepted_result/$failed_result)"
+            echo "[MAJOR CHANGE] (accepted/failed changed, expected $accepted_expected/$failed_expected, actual $accepted_actual/$failed_actual)"
             major_change=$((major_change + 1))
         fi
     fi