| Message ID | 1456811752-23961-1-git-send-email-oohall@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
On Tuesday 01 March 2016 11:25 AM, Oliver O'Halloran wrote: > Adds make targets to perform boot tests using multithreaded mambo. There This is confusing. Why are we calling this as "multithreaded mambo" when the test is enabling SMT=2 (cpu threads) for processor config in mambo? Maddy > are seperate targets for the kernel and hello_world payloads. > > Signed-off-by: Oliver O'Halloran <oohall@gmail.com> > --- > test/Makefile.check | 5 ++++- > test/hello_world/Makefile.check | 15 +++++++++++---- > 2 files changed, 15 insertions(+), 5 deletions(-) > > diff --git a/test/Makefile.check b/test/Makefile.check > index 8dc540a..da3a9dc 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-threaded-check qemu-boot-check debian-jessie-boot-check > > boot-check: skiboot.lid > ./test/run_mambo_boot_test.sh > > +boot-threaded-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..3faf592 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-threaded-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-threaded-mambo): %-check-threaded-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
Oliver O'Halloran <oohall@gmail.com> writes: > 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> Seems to work well, I changed threaded to smt, just for clarity and merged to master as of 1325599645ff46b0c767ef23ee8a36c0c7a4d13f
diff --git a/test/Makefile.check b/test/Makefile.check index 8dc540a..da3a9dc 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-threaded-check qemu-boot-check debian-jessie-boot-check boot-check: skiboot.lid ./test/run_mambo_boot_test.sh +boot-threaded-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..3faf592 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-threaded-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-threaded-mambo): %-check-threaded-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
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> --- test/Makefile.check | 5 ++++- test/hello_world/Makefile.check | 15 +++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-)