mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>, rcz@pengutronix.de
Subject: [PATCH 13/17] test: support running labgrid-pytest from out-of-tree build directory
Date: Mon, 12 Apr 2021 09:16:47 +0200	[thread overview]
Message-ID: <20210412071651.8769-14-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20210412071651.8769-1-a.fatoum@pengutronix.de>

The labgrid YAML configs use relative paths to reference the images to
use. This won't work for out-of-tree builds. Do like Linux does for the
scripts/gdb/vmlinux-gdb.py and symlink the labgrid test stuff into the
build directory. With this done, we can now call labgrid-pytest for both
in-tree and out-of-tree builds.

Symlinks are not created for the test directory as a whole:

  - ../../ from within a symlinked directory refers to the original
    destination, not where it's symlinked to
  - Build and test (__pycache__) artifacts are generated into test/.
    we don't want those ending up in the source directory

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 Makefile | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/Makefile b/Makefile
index 0a93915cf347..7db7cb7b4a3a 100644
--- a/Makefile
+++ b/Makefile
@@ -1136,6 +1136,10 @@ MRPROPER_FILES += .config .config.old .version .old_version \
                   include/config.h           \
 		  Module.symvers tags TAGS cscope*
 
+ifdef building_out_of_srctree
+MRPROPER_DIRS += test
+endif
+
 # clean - Delete most, but leave enough to build external modules
 #
 clean: rm-dirs  := $(CLEAN_DIRS)
@@ -1264,6 +1268,25 @@ docs: FORCE
 	@$(SPHINXBUILD) -b html -d $(objtree)/doctrees $(srctree)/Documentation \
 		$(objtree)/Documentation/html
 
+# Misc
+# ---------------------------------------------------------------------------
+
+# support running tests from the build directory
+
+PHONY += symlink_tests
+symlink_tests: prepare0
+ifdef building_out_of_srctree
+	@mkdir -p test/$(SRCARCH)
+	@for y in $(abspath $(srctree)/test/$(SRCARCH)/*.yaml); do \
+	  ln -fsn $$y $(objtree)/test/$(SRCARCH)/ ; \
+	done
+	@ln -fsn $(abspath $(srctree)/test/py) $(objtree)/test/
+	@ln -fsn $(abspath $(srctree)/test/conftest.py) $(objtree)/test/
+	@ln -fsn $(abspath $(srctree)/test/__init__.py) $(objtree)/test/
+endif
+
+all: symlink_tests
+
 # Single targets
 # ---------------------------------------------------------------------------
 # Single targets are compatible with:
-- 
2.29.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


  parent reply	other threads:[~2021-04-12  7:19 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-12  7:16 [PATCH 00/17] add barebox in-tree testing infrastructure Ahmad Fatoum
2021-04-12  7:16 ` [PATCH 01/17] kbuild: add install target Ahmad Fatoum
2021-04-12  7:16 ` [PATCH 02/17] kbuild: add ARCH={i386, x86_64} as aliases for x86 Ahmad Fatoum
2021-04-12  7:16 ` [PATCH 03/17] kbuild: add ARCH=um alias for sandbox Ahmad Fatoum
2021-04-12  7:16 ` [PATCH 04/17] MIPS: qemu-malta: generate swapped image as part of multi-image build Ahmad Fatoum
2021-04-12  9:27   ` Jules Maselbas
2021-04-12  9:45     ` Ahmad Fatoum
2021-04-12  7:16 ` [PATCH 05/17] MIPS: qemu-malta: replace board code with syscon-reboot Ahmad Fatoum
2021-04-12  7:16 ` [PATCH 06/17] MIPS: configs: qemu-malta: enable Virt I/O Ahmad Fatoum
2021-04-12  7:16 ` [PATCH 07/17] openrisc: set default KBUILD_IMAGE Ahmad Fatoum
2021-04-12  7:16 ` [PATCH 08/17] Documentation: boards: RISC-V: update TinyEMU support Ahmad Fatoum
2021-04-12  7:16 ` [PATCH 09/17] test: add basic barebox self-test infrastructure Ahmad Fatoum
2021-04-12 10:12   ` Jules Maselbas
2021-04-12  7:16 ` [PATCH 10/17] test: self: port Linux printf kselftest Ahmad Fatoum
2021-04-12  7:16 ` [PATCH 11/17] test: add labgrid configs for some emulated targets Ahmad Fatoum
2021-04-12  7:16 ` [PATCH 12/17] test: add first sample tests Ahmad Fatoum
2021-04-12  7:16 ` Ahmad Fatoum [this message]
2021-04-12  7:16 ` [PATCH 14/17] test: add emulate.pl, a runner for barebox on emulated targets Ahmad Fatoum
2021-04-12  7:16 ` [PATCH 15/17] test: self: run selftests as part of the pytest suite Ahmad Fatoum
2021-04-12  7:16 ` [PATCH 16/17] test: add bthread test Ahmad Fatoum
2021-04-12  7:16 ` [PATCH 17/17] [RFC] test: run ./test/emulate.pl in Github action Ahmad Fatoum

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=20210412071651.8769-14-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=rcz@pengutronix.de \
    /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