test: Apply missing renaming of expect_* functions

These were missed in 733f98804a4e but the error messages were hidden
then run via CTest.

diff --git a/test/suites/cleanup.bash b/test/suites/cleanup.bash
index 05d86fed8cbcf420b945bd1fa9468b70012e5091..a348dc7de95772b29f13ce8b8003bc5e1c622c66 100644 (file)
--- a/test/suites/cleanup.bash
+++ b/test/suites/cleanup.bash
@@ -57,11 +57,11 @@ SUITE_cleanup() {
     expect_stat 'cleanups performed' 1
     for i in 0 1 2; do
         file=$CCACHE_DIR/a/result$i-4017.result
-        expect_file_missing $CCACHE_DIR/a/result$i-4017.result
+        expect_missing $CCACHE_DIR/a/result$i-4017.result
     done
     for i in 3 4 5 6 7 8 9; do
         file=$CCACHE_DIR/a/result$i-4017.result
-        expect_file_exists $file
+        expect_exists $file
     done
 
     # -------------------------------------------------------------------------
@@ -84,11 +84,11 @@ SUITE_cleanup() {
         expect_stat 'cleanups performed' 1
         for i in 0 1 2 3 4 5 6; do
             file=$CCACHE_DIR/a/result$i-4017.result
-            expect_file_missing $file
+            expect_missing $file
         done
         for i in 7 8 9; do
             file=$CCACHE_DIR/a/result$i-4017.result
-            expect_file_exists $file
+            expect_exists $file
         done
     fi
     # -------------------------------------------------------------------------
@@ -140,7 +140,7 @@ SUITE_cleanup() {
 
     $CCACHE -F 160 -M 0 >/dev/null
     $CCACHE -c >/dev/null
-    expect_file_exists $CCACHE_DIR/a/abcd.unknown
+    expect_exists $CCACHE_DIR/a/abcd.unknown
     expect_stat 'files in cache' 10
 
     # -------------------------------------------------------------------------
@@ -154,7 +154,7 @@ SUITE_cleanup() {
     expect_stat 'files in cache' 11
 
     $CCACHE -F 160 -M 0 -c >/dev/null
-    expect_file_missing $CCACHE_DIR/a/abcd.unknown
+    expect_missing $CCACHE_DIR/a/abcd.unknown
     expect_stat 'files in cache' 10
 
     # -------------------------------------------------------------------------
@@ -166,7 +166,7 @@ SUITE_cleanup() {
     expect_stat 'files in cache' 1
     backdate $CCACHE_DIR/a/abcd.tmp.efgh
     $CCACHE -c >/dev/null
-    expect_file_missing $CCACHE_DIR/a/abcd.tmp.efgh
+    expect_missing $CCACHE_DIR/a/abcd.tmp.efgh
     expect_stat 'files in cache' 0
 
     # -------------------------------------------------------------------------

diff --git a/test/suites/direct.bash b/test/suites/direct.bash
index 7ae5ebe9181d98ad06202892ead77b31250f9b94..f185be7a2cd26949dea5b59dcf19a270d56dcaeb 100644 (file)
--- a/test/suites/direct.bash
+++ b/test/suites/direct.bash
@@ -145,7 +145,7 @@ EOF
         $CCACHE_COMPILE -MD -c test.c -o testdir/test$ext
         expect_stat 'cache hit (direct)' $((3 * i + 1))
         expect_stat 'cache miss' $((i + 1))
-        expect_file_exists $dep_file
+        expect_exists $dep_file
         if ! grep "test$ext:" $dep_file >/dev/null 2>&1; then
             test_failed "$dep_file does not contain \"test$ext:\""
         fi
@@ -159,7 +159,7 @@ EOF
         $CCACHE_COMPILE -MD -MQ $dep_target -c test.c -o testdir/test$ext
         expect_stat 'cache hit (direct)' $((3 * i + 2))
         expect_stat 'cache miss' $((i + 2))
-        expect_file_exists $dep_file
+        expect_exists $dep_file
         if ! grep $dep_target $dep_file >/dev/null 2>&1; then
             test_failed "$dep_file does not contain $dep_target"
         fi
@@ -457,7 +457,7 @@ EOF
     expect_stat 'cache hit (direct)' 0
     expect_stat 'cache hit (preprocessed)' 0
     expect_stat 'cache miss' 1
-    expect_file_exists code.gcno
+    expect_exists code.gcno
 
     rm code.gcno
 
@@ -465,7 +465,7 @@ EOF
     expect_stat 'cache hit (direct)' 1
     expect_stat 'cache hit (preprocessed)' 0
     expect_stat 'cache miss' 1
-    expect_file_exists code.gcno
+    expect_exists code.gcno
 
     # -------------------------------------------------------------------------
     TEST "-fstack-usage"
@@ -479,7 +479,7 @@ EOF
         expect_stat 'cache hit (direct)' 0
         expect_stat 'cache hit (preprocessed)' 0
         expect_stat 'cache miss' 1
-        expect_file_exists code.su
+        expect_exists code.su
 
         rm code.su
 
@@ -487,7 +487,7 @@ EOF
         expect_stat 'cache hit (direct)' 1
         expect_stat 'cache hit (preprocessed)' 0
         expect_stat 'cache miss' 1
-        expect_file_exists code.su
+        expect_exists code.su
     fi
 
     # -------------------------------------------------------------------------