From 02ee261150c350f85c55925d01ed342b8a1854c0 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@suse.com>
Date: Tue, 11 Jun 2013 12:16:18 +0100
Subject: Allow --headless to be disabled for unit tests.

Change-Id: I9f2a97715dc0d7fc5905afb1b908de97acdafc57
---
 solenv/gbuild/CppunitTest.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'solenv')

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index fd4b1222d5d5..2e5d4df710b4 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -51,7 +51,7 @@ gb_CppunitTest_CPPTESTCOMMAND := $(call gb_Executable_get_target_for_build,cppun
 gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))
 
 define gb_CppunitTest__make_args
---headless \
+$(HEADLESS) \
 "-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/install)" \
 $(if $(URE),\
     $(if $(strip $(CONFIGURATION_LAYERS)),\
@@ -127,6 +127,7 @@ $(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES :=
 $(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES :=
 $(call gb_CppunitTest_get_target,$(1)) : DBGSV_ERROR_OUT := shell
 $(call gb_CppunitTest_get_target,$(1)) : SAL_DIAGNOSE_ABORT :=
+$(call gb_CppunitTest_get_target,$(1)) : HEADLESS := --headless
 $$(eval $$(call gb_Module_register_target,$(call gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),CppunitTest)
 
@@ -285,6 +286,11 @@ $(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(gb_Configuration_registry
 
 endef
 
+define gb_CppunitTest_unset_headless
+$(call gb_CppunitTest_get_target,$(1)) : HEADLESS=
+
+endef
+
 # Use configuration for filters.
 #
 # Okay, this is not exactly true, because there may be configuration
-- 
cgit