From 065c4d1b5dad980a8bafc6fab8006f0df4fc2779 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Wed, 30 May 2018 21:27:34 -0400 Subject: [PATCH] new make cts options --- Makefile | 22 +++++++++++++--------- README.md | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index c7d9ce7..ab576ea 100644 --- a/Makefile +++ b/Makefile @@ -81,19 +81,23 @@ run: $(TARGET) $(TEST_LIST): $(TEST_LIST_SOURCE) cat $(TEST_LIST_SOURCE) | grep -v -e ".event" -e "query" >$(TEST_LIST) -cts: $(TARGET) $(TEST_LIST) +ifdef pick +cts: + cargo build --manifest-path libportability/Cargo.toml --features $(BACKEND),portability-gfx/env_logger + ($(DEQP) -n $(pick)) +else +ifdef debug +cts: $(LIBRARY) + #(cd $(DEQP_DIR) && LD_LIBRARY_PATH=$(FULL_LIBRARY_PATH) $(DEBUGGER) ./deqp-vk -n $(debug)) + LD_LIBRARY_PATH=$(FULL_LIBRARY_PATH) $(DEBUGGER) $(DEQP_DIR)/deqp-vk -n $(debug) +else +cts: $(LIBRARY) $(TEST_LIST) ($(DEQP) --deqp-caselist-file=$(TEST_LIST)) python $(CTS_DIR)/scripts/log/log_to_xml.py TestResults.qpa conformance/last.xml mv TestResults.qpa conformance/last.qpa firefox conformance/last.xml - -cts-pick: - cargo build --manifest-path libportability/Cargo.toml --features $(BACKEND),portability-gfx/env_logger - ($(DEQP) -n $(name)) - -cts-debug: $(TARGET) - #(cd $(DEQP_DIR) && LD_LIBRARY_PATH=$(FULL_LIBRARY_PATH) $(DEBUGGER) ./deqp-vk -n $(name)) - LD_LIBRARY_PATH=$(FULL_LIBRARY_PATH) $(DEBUGGER) $(DEQP_DIR)/deqp-vk -n $(name) +endif #debug +endif #pick clean: rm -f $(OBJECTS) $(TARGET) $(BINDING) diff --git a/README.md b/README.md index f729836..678e747 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Current blockers: - *Metal*: "api.buffer_view.access.suballocation.buffer_view_memory_test_complete" (missing R32Uint support). -Please visit [our wiki](https://github.com/gfx-rs/portability/wiki/Vulkan-CTS-status) for CTS hookup instructions. Once everything is set, you can generate the new results by calling `make cts` on Unix systems. When investigating a particular failure, it's handy to do `make cts-debug name=`, which runs a single test under system debugger (gdb/lldb). +Please visit [our wiki](https://github.com/gfx-rs/portability/wiki/Vulkan-CTS-status) for CTS hookup instructions. Once everything is set, you can generate the new results by calling `make cts` on Unix systems. When investigating a particular failure, it's handy to do `make cts debug=`, which runs a single test under system debugger (gdb/lldb). For simply inspecting the log output, one can also do `make cts pick=`. ## Check out ```