Rename test suite util to legacy_util

This makes room for the Catch2 test suite for util.cpp.

diff --git a/Makefile.in b/Makefile.in
index 6fb2fb6fcde3ff8e4eaba7dd9fa1920fbd6e254c..46bea4f0a9e74c51ed7b681b674f17dae6c4c201 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,9 +86,9 @@ test_suites += unittest/test_conf.cpp
 test_suites += unittest/test_counters.cpp
 test_suites += unittest/test_hash.cpp
 test_suites += unittest/test_hashutil.cpp
+test_suites += unittest/test_legacy_util.cpp
 test_suites += unittest/test_lockfile.cpp
 test_suites += unittest/test_stats.cpp
-test_suites += unittest/test_util.cpp
 
 test_sources = unittest/main.cpp unittest/framework.cpp unittest/util.cpp
 test_sources += $(test_suites)

diff --git a/unittest/main.cpp b/unittest/main.cpp
index 9c700ebf21da4da4ae60bcb911ef335a80c03b30..2c28d9d89f6e9bb1175ad6d73261236aa7ae922c 100644 (file)
--- a/unittest/main.cpp
+++ b/unittest/main.cpp
@@ -30,26 +30,26 @@ unsigned suite_conf(unsigned);
 unsigned suite_counters(unsigned);
 unsigned suite_hash(unsigned);
 unsigned suite_hashutil(unsigned);
+unsigned suite_legacy_util(unsigned);
 unsigned suite_lockfile(unsigned);
 unsigned suite_stats(unsigned);
-unsigned suite_util(unsigned);
 
 int
 main(int argc, char** argv)
 {
-  suite_fn suites[] = {&suite_args,
-                       &suite_argument_processing,
-                       &suite_compopt,
-                       &suite_compr_type_none,
-                       &suite_compr_type_zstd,
-                       &suite_conf,
-                       &suite_counters,
-                       &suite_hash,
-                       &suite_hashutil,
-                       &suite_lockfile,
-                       &suite_stats,
-                       &suite_util,
-                       NULL};
+  suite_fn legacy_suites[] = {&suite_args,
+                              &suite_argument_processing,
+                              &suite_compopt,
+                              &suite_compr_type_none,
+                              &suite_compr_type_zstd,
+                              &suite_conf,
+                              &suite_counters,
+                              &suite_hash,
+                              &suite_hashutil,
+                              &suite_legacy_util,
+                              &suite_lockfile,
+                              &suite_stats,
+                              NULL};
 
 #ifdef _WIN32
   putenv("CCACHE_DETECT_SHEBANG=1");
@@ -67,7 +67,7 @@ main(int argc, char** argv)
   // Run legacy tests.
   if (result == 0) {
     bool verbose = false;
-    result = cct_run(suites, verbose);
+    result = cct_run(legacy_suites, verbose);
   }
 
   if (result == 0) {

diff --git a/unittest/test_util.cpp b/unittest/test_legacy_util.cpp
similarity index 99%
rename from unittest/test_util.cpp
rename to unittest/test_legacy_util.cpp
index 88e6c8c61c37b187398c9c25eded07e901463ad1..06fac0d66ffa0cc0d418f16d7decd954dd8e39a6 100644 (file)
--- a/unittest/test_util.cpp
+++ b/unittest/test_legacy_util.cpp
@@ -23,7 +23,7 @@
 
 static char FOO_ENV[] = "FOO=bar";
 
-TEST_SUITE(util)
+TEST_SUITE(legacy_util)
 
 TEST(x_basename)
 {