From: Joel Rosdahl <joel@rosdahl.net>
Date: Tue, 24 Aug 2021 17:40:35 +0000 (+0200)
Subject: test: Improve output of differing text files on failure
X-Git-Tag: v4.4.1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e36c2bd9cff21e45af0beff9cd90de1986e0b140;p=thirdparty%2Fccache.git

test: Improve output of differing text files on failure
---

diff --git a/test/run b/test/run
index 957f5afac..f98c3a79b 100755
--- a/test/run
+++ b/test/run
@@ -203,18 +203,6 @@ expect_equal_content() {
     if [ ! -e "$2" ]; then
         test_failed_internal "expect_equal_content: $2 missing"
     fi
-    if ! cmp -s "$1" "$2"; then
-        test_failed_internal "$1 and $2 differ"
-    fi
-}
-
-expect_equal_text_content() {
-    if [ ! -e "$1" ]; then
-        test_failed_internal "expect_equal_text_content: $1 missing"
-    fi
-    if [ ! -e "$2" ]; then
-        test_failed_internal "expect_equal_text_content: $2 missing"
-    fi
     if ! cmp -s "$1" "$2"; then
         test_failed_internal "$1 and $2 differ: $(echo; diff -u "$1" "$2")"
     fi
diff --git a/test/suites/base.bash b/test/suites/base.bash
index ec845efee..cc6d140de 100644
--- a/test/suites/base.bash
+++ b/test/suites/base.bash
@@ -1113,13 +1113,13 @@ EOF
     expect_stat preprocessed_cache_hit 0
     expect_stat cache_miss 1
     expect_stat files_in_cache 1
-    expect_equal_text_content reference_stderr.txt stderr.txt
+    expect_equal_content reference_stderr.txt stderr.txt
 
     $CCACHE_COMPILE -Wall -c stderr.c -fsyntax-only 2>stderr.txt
     expect_stat preprocessed_cache_hit 1
     expect_stat cache_miss 1
     expect_stat files_in_cache 1
-    expect_equal_text_content reference_stderr.txt stderr.txt
+    expect_equal_content reference_stderr.txt stderr.txt
 
     # -------------------------------------------------------------------------
     TEST "Empty object file"
diff --git a/test/suites/direct.bash b/test/suites/direct.bash
index 4e22c93b8..9b54a5974 100644
--- a/test/suites/direct.bash
+++ b/test/suites/direct.bash
@@ -222,17 +222,17 @@ EOF
             $CCACHE_COMPILE -c test.c $dep_args $obj_args
             expect_stat direct_cache_hit 0
             expect_stat cache_miss 1
-            expect_equal_text_content $dep_file.real $dep_file
+            expect_equal_content $dep_file.real $dep_file
 
             # cache hit
             $CCACHE_COMPILE -c test.c $dep_args $obj_args
             expect_stat direct_cache_hit 1
             expect_stat cache_miss 1
-            expect_equal_text_content $dep_file.real $dep_file
+            expect_equal_content $dep_file.real $dep_file
 
             # change object file name
             $CCACHE_COMPILE -c test.c $dep_args -o another.o
-            expect_equal_text_content another.d.real $another_dep_file
+            expect_equal_content another.d.real $another_dep_file
         done
     done