aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOliver O'Halloran <oohall@gmail.com>2016-03-01 16:55:52 +1100
committerStewart Smith <stewart@linux.vnet.ibm.com>2016-03-07 13:47:43 +1100
commit1325599645ff46b0c767ef23ee8a36c0c7a4d13f (patch)
treebff3af6d364dd866700efee1ef402edec26ff841 /test
parent9a25fcc0503488c63c4443a8dde9f77e90c314a5 (diff)
downloadskiboot-1325599645ff46b0c767ef23ee8a36c0c7a4d13f.zip
skiboot-1325599645ff46b0c767ef23ee8a36c0c7a4d13f.tar.gz
skiboot-1325599645ff46b0c767ef23ee8a36c0c7a4d13f.tar.bz2
test: add multithreaded mambo tests
Adds make targets to perform boot tests using multithreaded mambo. There are seperate targets for the kernel and hello_world payloads. Signed-off-by: Oliver O'Halloran <oohall@gmail.com> [stewart@linux.vnet.ibm.com: Use SMT rather than threaded in test description] Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.check5
-rw-r--r--test/hello_world/Makefile.check15
2 files changed, 15 insertions, 5 deletions
diff --git a/test/Makefile.check b/test/Makefile.check
index 8dc540a..a361e7f 100644
--- a/test/Makefile.check
+++ b/test/Makefile.check
@@ -1,8 +1,11 @@
-check: boot-check qemu-boot-check debian-jessie-boot-check
+check: boot-check boot-smt-check qemu-boot-check debian-jessie-boot-check
boot-check: skiboot.lid
./test/run_mambo_boot_test.sh
+boot-smt-check: skiboot.lid
+ THREADS=2 ./test/run_mambo_boot_test.sh
+
qemu-boot-check: skiboot.lid
./test/run_qemu_boot_test.sh
diff --git a/test/hello_world/Makefile.check b/test/hello_world/Makefile.check
index 7a1889e..ee813f1 100644
--- a/test/hello_world/Makefile.check
+++ b/test/hello_world/Makefile.check
@@ -1,13 +1,20 @@
HELLO_WORLD_TEST := test/hello_world/hello_kernel/hello_kernel
-check: $(HELLO_WORLD_TEST:%=%-check-mambo) $(HELLO_WORLD_TEST:%=%-check-qemu)
+.PHONY: hello_world-tests
+hello_world-tests: $(HELLO_WORLD_TEST:%=%-check-smt-mambo)
+hello_world-tests: $(HELLO_WORLD_TEST:%=%-check-mambo)
+hello_world-tests: $(HELLO_WORLD_TEST:%=%-check-qemu)
-boot-tests: $(HELLO_WORLD_TEST:%=%-check-mambo) $(HELLO_WORLD_TEST:%=%-check-qemu)
+boot-tests: hello_world-tests
+check: hello_world-tests
-$(HELLO_WORLD_TEST:%=%-check-mambo) : %-check-mambo: % skiboot.lid
+$(HELLO_WORLD_TEST:%=%-check-smt-mambo): %-check-smt-mambo: % skiboot.lid
+ THREADS=2 ./test/hello_world/run_mambo_hello_world.sh
+
+$(HELLO_WORLD_TEST:%=%-check-mambo): %-check-mambo: % skiboot.lid
./test/hello_world/run_mambo_hello_world.sh
-$(HELLO_WORLD_TEST:%=%-check-qemu) : %-check-qemu: % skiboot.lid
+$(HELLO_WORLD_TEST:%=%-check-qemu): %-check-qemu: % skiboot.lid
./test/hello_world/run_qemu_hello_world.sh
test/hello_world/hello_kernel/hello_kernel.o: test/hello_world/hello_kernel/hello_kernel.S test/hello_world/hello_kernel/hello_kernel.ld