File: do-not-abort-on-NON_APPLICATION_FONT_USE.diff

package info (click to toggle)
libreoffice 4%3A26.2.0~beta1-1
  • links: PTS, VCS
  • area: main
  • in suites: experimental
  • size: 3,828,416 kB
  • sloc: cpp: 4,392,799; xml: 499,109; java: 254,438; python: 81,768; ansic: 33,823; perl: 30,297; javascript: 19,722; sh: 12,050; makefile: 10,836; cs: 8,865; yacc: 8,549; objc: 2,131; lex: 1,385; asm: 1,231; awk: 996; pascal: 914; csh: 20; sed: 5
file content (14 lines) | stat: -rw-r--r-- 738 bytes parent folder | download | duplicates (4) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
 
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index b16e3d0e5417..33bdde04b072 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -132,9 +132,6 @@ else
 		$(if $(gb_CppunitTest__vcl_no_svp), \
 			$(filter-out SAL_USE_VCLPLUGIN=svp,$(gb_TEST_ENV_VARS)),$(gb_TEST_ENV_VARS)) \
 		$(EXTRA_ENV_VARS) \
-		$(if $(filter allow,$(NON_APPLICATION_FONT_USE)),, \
-			$(if $(filter abort,$(NON_APPLICATION_FONT_USE)),SAL_NON_APPLICATION_FONT_USE=abort, \
-			$(if $(filter deny,$(NON_APPLICATION_FONT_USE)),SAL_NON_APPLICATION_FONT_USE=deny))) \
 		$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
 		$(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
 		$(if $(strip $(PYTHON_URE)),\