cputest: Drop .new suffix from CPU test data files

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/tests/cputest.c b/tests/cputest.c
index 8c16fb95c29587381d4b3d788c5877e9e84798e7..b7dd95d843b1b564e62a2a5357d0fdb2a241d9c9 100644 (file)
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -527,7 +527,7 @@ cpuTestJSONCPUID(const void *arg)
     char *result = NULL;
     int ret = -1;
 
-    if (virAsprintf(&json, "%s/cputestdata/%s-cpuid-%s.json.new",
+    if (virAsprintf(&json, "%s/cputestdata/%s-cpuid-%s.json",
                     abs_srcdir, virArchToString(data->arch), data->host) < 0 ||
         virAsprintf(&result, "cpuid-%s-json", data->host) < 0)
         goto cleanup;

diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K.json.new b/tests/cputestdata/x86_64-cpuid-A10-5800K.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-A10-5800K.json.new
rename to tests/cputestdata/x86_64-cpuid-A10-5800K.json

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500.json.new b/tests/cputestdata/x86_64-cpuid-Core-i5-2500.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Core-i5-2500.json.new
rename to tests/cputestdata/x86_64-cpuid-Core-i5-2500.json

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json.new b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json.new
rename to tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json.new b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json.new
rename to tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600.json.new b/tests/cputestdata/x86_64-cpuid-Core-i5-6600.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Core-i5-6600.json.new
rename to tests/cputestdata/x86_64-cpuid-Core-i5-6600.json

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600.json.new b/tests/cputestdata/x86_64-cpuid-Core-i7-2600.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Core-i7-2600.json.new
rename to tests/cputestdata/x86_64-cpuid-Core-i7-2600.json

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json.new b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json.new
rename to tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770.json.new b/tests/cputestdata/x86_64-cpuid-Core-i7-3770.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Core-i7-3770.json.new
rename to tests/cputestdata/x86_64-cpuid-Core-i7-3770.json

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json.new b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json.new
rename to tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json.new b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json.new
rename to tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json

diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850.json.new b/tests/cputestdata/x86_64-cpuid-Core2-E6850.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Core2-E6850.json.new
rename to tests/cputestdata/x86_64-cpuid-Core2-E6850.json

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350.json.new b/tests/cputestdata/x86_64-cpuid-Opteron-2350.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Opteron-2350.json.new
rename to tests/cputestdata/x86_64-cpuid-Opteron-2350.json

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234.json.new b/tests/cputestdata/x86_64-cpuid-Opteron-6234.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Opteron-6234.json.new
rename to tests/cputestdata/x86_64-cpuid-Opteron-6234.json

diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95.json.new b/tests/cputestdata/x86_64-cpuid-Phenom-B95.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Phenom-B95.json.new
rename to tests/cputestdata/x86_64-cpuid-Phenom-B95.json

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json.new b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json.new
rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json.new b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json.new
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json.new b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json.new
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json.new b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json.new
rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520.json.new b/tests/cputestdata/x86_64-cpuid-Xeon-W3520.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-W3520.json.new
rename to tests/cputestdata/x86_64-cpuid-Xeon-W3520.json