[PATCH kvm-unit-tests 0/2] x86: remove tscdeadline_latency from unittest.cfg

[PATCH kvm-unit-tests 0/2] x86: remove tscdeadline_latency from unittest.cfg

[Radim Krčmář]

unittest.cfg expects tscdeadline_latency.flat, while the existing
filename contains a dash => we don't call it from ./run_tests.sh.
(Which is considered a PASS :)

tscdeadline_latency isn't a unit test so we can omit it.
(Feel free to drop [1/2], I just loathe inconsistencies.)


Radim Krčmář (2):
  x86: use underline in tscdeadline-latency filename
  x86: remove tscdeadline_latency from unittest.cfg

 config/config-x86-common.mak                         | 2 +-
 config/config-x86_64.mak                             | 2 +-
 x86/{tscdeadline-latency.c => tscdeadline_latency.c} | 0
 x86/unittests.cfg                                    | 5 -----
 4 files changed, 2 insertions(+), 7 deletions(-)
 rename x86/{tscdeadline-latency.c => tscdeadline_latency.c} (100%)

-- 
2.2.1

[PATCH kvm-unit-tests 1/2] x86: use underline in tscdeadline-latency filename

[Radim Krčmář]

x86/unittests.cfg uses the variant with underscore.
Rename tscdeadline-latency.c instead of fixing x86/unittests.cfg because
we use only underscores elsewhere.

Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
---
 config/config-x86-common.mak                         | 2 +-
 config/config-x86_64.mak                             | 2 +-
 x86/{tscdeadline-latency.c => tscdeadline_latency.c} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename x86/{tscdeadline-latency.c => tscdeadline_latency.c} (100%)

diff --git a/config/config-x86-common.mak b/config/config-x86-common.mak
index e016529dc110..8fc3490bd8bd 100644
--- a/config/config-x86-common.mak
+++ b/config/config-x86-common.mak
@@ -69,7 +69,7 @@ $(TEST_DIR)/tsc_adjust.elf: $(cstart.o) $(TEST_DIR)/tsc_adjust.o
 
 $(TEST_DIR)/apic.elf: $(cstart.o) $(TEST_DIR)/apic.o
 
-$(TEST_DIR)/tscdeadline-latency.elf: $(cstart.o) $(TEST_DIR)/tscdeadline-latency.o
+$(TEST_DIR)/tscdeadline_latency.elf: $(cstart.o) $(TEST_DIR)/tscdeadline_latency.o
 
 $(TEST_DIR)/init.elf: $(cstart.o) $(TEST_DIR)/init.o
 
diff --git a/config/config-x86_64.mak b/config/config-x86_64.mak
index dbbdaf5c76f3..d62c1e9ae42d 100644
--- a/config/config-x86_64.mak
+++ b/config/config-x86_64.mak
@@ -9,6 +9,6 @@ tests = $(TEST_DIR)/access.flat $(TEST_DIR)/apic.flat \
 	  $(TEST_DIR)/pcid.flat $(TEST_DIR)/debug.flat
 tests += $(TEST_DIR)/svm.flat
 tests += $(TEST_DIR)/vmx.flat
-tests += $(TEST_DIR)/tscdeadline-latency.flat
+tests += $(TEST_DIR)/tscdeadline_latency.flat
 
 include config/config-x86-common.mak
diff --git a/x86/tscdeadline-latency.c b/x86/tscdeadline_latency.c
similarity index 100%
rename from x86/tscdeadline-latency.c
rename to x86/tscdeadline_latency.c
-- 
2.2.1

[PATCH kvm-unit-tests 2/2] x86: remove tscdeadline_latency from unittest.cfg

[Radim Krčmář]

There is no point in executing it through run_tests.sh.

Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
---
 x86/unittests.cfg | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/x86/unittests.cfg b/x86/unittests.cfg
index 75b959535c01..badb08ad138e 100644
--- a/x86/unittests.cfg
+++ b/x86/unittests.cfg
@@ -161,8 +161,3 @@ arch = x86_64
 [debug]
 file = debug.flat
 arch = x86_64
-
-[tscdeadline_latency]
-file = tscdeadline_latency.flat
-extra_params = -cpu qemu64,+tsc-deadline
-arch = x86_64
-- 
2.2.1

Re: [PATCH kvm-unit-tests 0/2] x86: remove tscdeadline_latency from unittest.cfg

[Paolo Bonzini]

On 20/01/2015 15:27, Radim Krčmář wrote:
> unittest.cfg expects tscdeadline_latency.flat, while the existing
> filename contains a dash => we don't call it from ./run_tests.sh.
> (Which is considered a PASS :)
> 
> tscdeadline_latency isn't a unit test so we can omit it.
> (Feel free to drop [1/2], I just loathe inconsistencies.)

Applied, thanks.

Paolo