public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Andrew Jones <drjones@redhat.com>
To: kvm@vger.kernel.org
Cc: pbonzini@redhat.com, mtosatti@redhat.com, jen@redhat.com
Subject: [kvm-unit-tests PATCH 8/9] Makefile: change 'make install' to install standalone tests
Date: Fri, 10 Jul 2015 18:45:02 +0200	[thread overview]
Message-ID: <1436546703-12258-9-git-send-email-drjones@redhat.com> (raw)
In-Reply-To: <1436546703-12258-1-git-send-email-drjones@redhat.com>

make install wasn't very useful without also installing scripts for
the qemu command lines. I suspect 'make install' was never used.
Installing standalone tests could be useful though, so let's do
that instead.

Signed-off-by: Andrew Jones <drjones@redhat.com>
---
 Makefile                     | 6 +++---
 config/config-arm-common.mak | 2 --
 config/config-x86-common.mak | 2 --
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 7b1986b9133ad..def8ea25372e9 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ endif
 
 include config.mak
 
-DESTDIR := $(PREFIX)/share/qemu/tests
+DESTDIR := $(PREFIX)/share/kvm-unit-tests/tests
 
 .PHONY: arch_clean clean distclean cscope
 
@@ -67,9 +67,9 @@ $(LIBFDT_archive): $(addprefix $(LIBFDT_objdir)/,$(LIBFDT_OBJS))
 standalone: all
 	@scripts/mkallstandalone.sh
 
-install:
+install: standalone
 	mkdir -p $(DESTDIR)
-	install $(tests_and_config) $(DESTDIR)
+	install tests/* $(DESTDIR)
 
 clean: arch_clean
 	$(RM) lib/.*.d $(libcflat) $(cflatobjs)
diff --git a/config/config-arm-common.mak b/config/config-arm-common.mak
index 0674daaa476d7..698555d6a676f 100644
--- a/config/config-arm-common.mak
+++ b/config/config-arm-common.mak
@@ -64,8 +64,6 @@ arm_clean: libfdt_clean asm_offsets_clean
 
 ##################################################################
 
-tests_and_config = $(TEST_DIR)/*.flat $(TEST_DIR)/unittests.cfg
-
 generated_files = $(asm-offsets)
 
 test_cases: $(generated_files) $(tests-common) $(tests)
diff --git a/config/config-x86-common.mak b/config/config-x86-common.mak
index d45c9a8e454d8..2ee7b7724bbaf 100644
--- a/config/config-x86-common.mak
+++ b/config/config-x86-common.mak
@@ -43,8 +43,6 @@ tests-common += api/dirty-log
 tests-common += api/dirty-log-perf
 endif
 
-tests_and_config = $(TEST_DIR)/*.flat $(TEST_DIR)/unittests.cfg
-
 test_cases: $(tests-common) $(tests)
 
 $(TEST_DIR)/%.o: CFLAGS += -std=gnu99 -ffreestanding -I lib -I lib/x86
-- 
2.4.3


  parent reply	other threads:[~2015-07-10 16:45 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-10 16:44 [kvm-unit-tests PATCH 0/9] Generate standalone tests Andrew Jones
2015-07-10 16:44 ` [kvm-unit-tests PATCH 1/9] x86/run: source config.mak Andrew Jones
2015-07-10 16:44 ` [kvm-unit-tests PATCH 2/9] run_tests.sh: remove blank line from start of log Andrew Jones
2015-07-10 16:44 ` [kvm-unit-tests PATCH 3/9] run_tests.sh: add '-d' for dry-run Andrew Jones
2015-07-10 16:44 ` [kvm-unit-tests PATCH 4/9] run_tests.sh: allow default unittests.cfg override Andrew Jones
2015-07-10 16:44 ` [kvm-unit-tests PATCH 5/9] unittests.cfg: use double quotes Andrew Jones
2015-07-10 16:45 ` [kvm-unit-tests PATCH 6/9] arm/unittests.cfg: make test names more friendly Andrew Jones
2015-07-10 16:45 ` [kvm-unit-tests PATCH 7/9] scripts: introduce mk[all]standalone.sh Andrew Jones
2015-07-10 16:45 ` Andrew Jones [this message]
2015-07-10 16:45 ` [kvm-unit-tests PATCH 9/9] standalone: add documentation to README Andrew Jones
2015-07-13  9:46 ` [kvm-unit-tests PATCH 0/9] Generate standalone tests Andrew Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1436546703-12258-9-git-send-email-drjones@redhat.com \
    --to=drjones@redhat.com \
    --cc=jen@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=mtosatti@redhat.com \
    --cc=pbonzini@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox