[Intel-gfx] [PATCH 17/23] piglit: Make sure there's no DRM master before launching the tests

Damien Lespiau damien.lespiau at intel.com
Fri Nov 15 17:33:34 CET 2013


Also, use && between statements so we stop the chain once something
fails.

Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
---
 Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 5086406..e790efe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,6 +59,7 @@ TEST_TARGETS := #
 TEST_TARGETS += run-test
 run-tests:
 	@[ -z "$(RESUME)" -a -n "$(R)" ] && RESUME=$(R); \
+	$(srcdir)/tests/check_drm_clients && \
 	if [ -n "$$RESUME" ]; then \
 		[ ! -f $$RESUME/main ] && { \
 			echo "$$RESUME is not a valid piglit project"; \
@@ -70,7 +71,7 @@ run-tests:
 	else \
 		source $(srcdir)/scripts/build-piglit.sh && \
 		output=$$(igt_result_directory); \
-	fi; \
+	fi && \
 	$(PIGLIT) $${PIGLIT_FLAGS} $(IGT_TESTS) $$output && \
 	$(PIGLIT_HTML) --overwrite $$output/html $$output/main && \
 	echo "HTML summary is at $$output/html/index.html" && \
-- 
1.8.3.1




More information about the Intel-gfx mailing list