From patchwork Thu Jun 24 23:29:51 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Lucas Meneghel Rodrigues <lmr@redhat.com>
X-Patchwork-Id: 107953
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5ONTxMq029894
	for <patchwork-kvm@patchwork.kernel.org>;
	Thu, 24 Jun 2010 23:29:59 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751850Ab0FXX35 (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Thu, 24 Jun 2010 19:29:57 -0400
Received: from mx1.redhat.com ([209.132.183.28]:36186 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751410Ab0FXX34 (ORCPT <rfc822;kvm@vger.kernel.org>);
	Thu, 24 Jun 2010 19:29:56 -0400
Received: from int-mx01.intmail.prod.int.phx2.redhat.com
	(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5ONTuNm001661
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <kvm@vger.kernel.org>; Thu, 24 Jun 2010 19:29:56 -0400
Received: from localhost.localdomain (vpn-9-214.rdu.redhat.com [10.11.9.214])
	by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id o5ONTssE012250; Thu, 24 Jun 2010 19:29:54 -0400
From: Lucas Meneghel Rodrigues <lmr@redhat.com>
To: kvm@vger.kernel.org
Cc: avi@redhat.com, mgoldish@redhat.com,
	Lucas Meneghel Rodrigues <lmr@redhat.com>
Subject: [PATCH] qemu-kvm tests: Create make target for install tests
Date: Thu, 24 Jun 2010 20:29:51 -0300
Message-Id: <1277422191-13424-1-git-send-email-lmr@redhat.com>
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Thu, 24 Jun 2010 23:29:59 +0000 (UTC)


diff --git a/kvm/test/Makefile b/kvm/test/Makefile
index 18e25c6..456ceae 100644
--- a/kvm/test/Makefile
+++ b/kvm/test/Makefile
@@ -1,7 +1,7 @@
 
 include config.mak
 
-DESTDIR :=
+DESTDIR := $(PREFIX)/share/qemu/tests
 
 .PHONY: arch_clean clean
 
@@ -56,5 +56,9 @@ $(libcflat): $(cflatobjs)
 
 -include .*.d
 
+install:
+	mkdir -p $(DESTDIR)
+	install $(tests_and_config) $(DESTDIR)
+
 clean: arch_clean
 	$(RM) kvmctl kvmtrace *.o *.a .*.d $(libcflat) $(cflatobjs)
diff --git a/kvm/test/config-x86-common.mak b/kvm/test/config-x86-common.mak
index 0e1ccce..689e6b4 100644
--- a/kvm/test/config-x86-common.mak
+++ b/kvm/test/config-x86-common.mak
@@ -27,6 +27,8 @@ tests-common = $(TEST_DIR)/vmexit.flat $(TEST_DIR)/tsc.flat \
                $(TEST_DIR)/realmode.flat $(TEST_DIR)/msr.flat \
                $(TEST_DIR)/hypercall.flat $(TEST_DIR)/sieve.flat
 
+tests_and_config = $(tests-common) $(TEST_DIR)/unittests.cfg
+
 test_cases: $(tests-common) $(tests)
 
 $(TEST_DIR)/%.o: CFLAGS += -std=gnu99 -ffreestanding -I lib -I lib/x86
diff --git a/kvm/test/x86/unittests.cfg b/kvm/test/x86/unittests.cfg
new file mode 100644
index 0000000..4a40989
--- /dev/null
+++ b/kvm/test/x86/unittests.cfg
@@ -0,0 +1,52 @@
+# Define your new unittest following the convention:
+# [unittest_name]
+# file = foo.flat # Name of the flat file to be used
+# smp = 2 # Number of processors the VM will use during this test
+# extra_params = -cpu qemu64,+x2apic # Additional parameters used
+
+[apic]
+file = apic.flat
+smp = 2
+extra_params: -cpu qemu64,+x2apic
+
+[smptest]
+file = smptest.flat
+smp = 2
+
+[smptest3]
+file = smptest.flat
+smp = 3
+
+[vmexit]
+file = vmexit.flat
+smp = 2
+
+[access]
+file = access.flat
+
+[emulator]
+file = emulator.flat
+
+[hypercall]
+file = hypercall.flat
+
+[idt_test]
+file = idt_test.flat
+
+[msr]
+file = msr.flat
+
+[port80]
+file = port80.flat
+
+[realmode]
+file = realmode.flat
+
+[sieve]
+file = sieve.flat
+
+[tsc]
+file = tsc.flat
+
+[xsave]
+file = xsave.flat