10:45 a.m.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
Notes:
Version 2:
- no change
tests/cputest.c | 2 +-
.../{x86_64-cpuid-A10-5800K.json.new => x86_64-cpuid-A10-5800K.json} | 0
...86_64-cpuid-Core-i5-2500.json.new => x86_64-cpuid-Core-i5-2500.json} | 0
..._64-cpuid-Core-i5-2540M.json.new => x86_64-cpuid-Core-i5-2540M.json} | 0
..._64-cpuid-Core-i5-4670T.json.new => x86_64-cpuid-Core-i5-4670T.json} | 0
...86_64-cpuid-Core-i5-6600.json.new => x86_64-cpuid-Core-i5-6600.json} | 0
...86_64-cpuid-Core-i7-2600.json.new => x86_64-cpuid-Core-i7-2600.json} | 0
...4-cpuid-Core-i7-3740QM.json.new => x86_64-cpuid-Core-i7-3740QM.json} | 0
...86_64-cpuid-Core-i7-3770.json.new => x86_64-cpuid-Core-i7-3770.json} | 0
..._64-cpuid-Core-i7-4600U.json.new => x86_64-cpuid-Core-i7-4600U.json} | 0
..._64-cpuid-Core-i7-5600U.json.new => x86_64-cpuid-Core-i7-5600U.json} | 0
...{x86_64-cpuid-Core2-E6850.json.new => x86_64-cpuid-Core2-E6850.json} | 0
...86_64-cpuid-Opteron-2350.json.new => x86_64-cpuid-Opteron-2350.json} | 0
...86_64-cpuid-Opteron-6234.json.new => x86_64-cpuid-Opteron-6234.json} | 0
.../{x86_64-cpuid-Phenom-B95.json.new => x86_64-cpuid-Phenom-B95.json} | 0
...86_64-cpuid-Xeon-E3-1245.json.new => x86_64-cpuid-Xeon-E3-1245.json} | 0
...86_64-cpuid-Xeon-E5-2630.json.new => x86_64-cpuid-Xeon-E5-2630.json} | 0
...86_64-cpuid-Xeon-E5-2650.json.new => x86_64-cpuid-Xeon-E5-2650.json} | 0
...86_64-cpuid-Xeon-E7-4820.json.new => x86_64-cpuid-Xeon-E7-4820.json} | 0
.../{x86_64-cpuid-Xeon-W3520.json.new => x86_64-cpuid-Xeon-W3520.json} | 0
20 files changed, 1 insertion(+), 1 deletion(-)
rename tests/cputestdata/{x86_64-cpuid-A10-5800K.json.new =>
x86_64-cpuid-A10-5800K.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Core-i5-2500.json.new =>
x86_64-cpuid-Core-i5-2500.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Core-i5-2540M.json.new =>
x86_64-cpuid-Core-i5-2540M.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Core-i5-4670T.json.new =>
x86_64-cpuid-Core-i5-4670T.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Core-i5-6600.json.new =>
x86_64-cpuid-Core-i5-6600.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Core-i7-2600.json.new =>
x86_64-cpuid-Core-i7-2600.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Core-i7-3740QM.json.new =>
x86_64-cpuid-Core-i7-3740QM.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Core-i7-3770.json.new =>
x86_64-cpuid-Core-i7-3770.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Core-i7-4600U.json.new =>
x86_64-cpuid-Core-i7-4600U.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Core-i7-5600U.json.new =>
x86_64-cpuid-Core-i7-5600U.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Core2-E6850.json.new =>
x86_64-cpuid-Core2-E6850.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Opteron-2350.json.new =>
x86_64-cpuid-Opteron-2350.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Opteron-6234.json.new =>
x86_64-cpuid-Opteron-6234.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Phenom-B95.json.new =>
x86_64-cpuid-Phenom-B95.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E3-1245.json.new =>
x86_64-cpuid-Xeon-E3-1245.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2630.json.new =>
x86_64-cpuid-Xeon-E5-2630.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2650.json.new =>
x86_64-cpuid-Xeon-E5-2650.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E7-4820.json.new =>
x86_64-cpuid-Xeon-E7-4820.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-W3520.json.new =>
x86_64-cpuid-Xeon-W3520.json} (100%)
diff --git a/tests/cputest.c b/tests/cputest.c
index 8c16fb95c..b7dd95d84 100644
--- 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
--
2.11.1