svn commit: r356423 - in head: share/mk tests/sys/fs

[Kyle Evans]

Author: kevans
Date: Mon Jan  6 18:25:58 2020
New Revision: 356423
URL: https://svnweb.freebsd.org/changeset/base/356423

Log:
  Refine fusefs test workaround for mips+llvm
  
  This re-enables building the googletest suite by default on mips and instead
  specifically doesn't build fusefs tests for mips+clang builds.  clang will
  easily spent >= 1.5 hours compiling a single file due to a bug in
  optimization (see LLVM PR 43263), so turn these off for now while that's
  hashed out.
  
  GCC builds are unaffected and build the fusefs tests as-is. Clang builds
  only happen by early adopters attempting to hash out the remaining issues.
  
  The comment has been updated to reflect its new position and use less strong
  wording about imposing on people.
  
  Discussed with:	ngie, asomers
  Reviewed by:	ngie

Modified:
  head/share/mk/src.opts.mk
  head/tests/sys/fs/Makefile

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Mon Jan  6 18:15:55 2020	(r356422)
+++ head/share/mk/src.opts.mk	Mon Jan  6 18:25:58 2020	(r356423)
@@ -108,6 +108,7 @@ __DEFAULT_YES_OPTIONS = \
     GDB \
     GNU_DIFF \
     GNU_GREP \
+    GOOGLETEST \
     GPIO \
     HAST \
     HTML \
@@ -263,15 +264,6 @@ __T=${MACHINE_ARCH}
 __TT=${TARGET}
 .else
 __TT=${MACHINE}
-.endif
-
-# Default GOOGLETEST to off for MIPS while LLVM PR 43263 is active.  Part
-# of the fusefs tests trigger excessively long compile times.  It does
-# eventually succeed, but this shouldn't be forced on those building by default.
-.if ${__TT} == "mips"
-__DEFAULT_NO_OPTIONS+=	GOOGLETEST
-.else
-__DEFAULT_YES_OPTIONS+=	GOOGLETEST
 .endif
 
 # All supported backends for LLVM_TARGET_XXX

Modified: head/tests/sys/fs/Makefile
==============================================================================
--- head/tests/sys/fs/Makefile	Mon Jan  6 18:15:55 2020	(r356422)
+++ head/tests/sys/fs/Makefile	Mon Jan  6 18:25:58 2020	(r356423)
@@ -12,7 +12,12 @@ TESTSRC=		${SRCTOP}/contrib/netbsd-tests/fs
 #TESTS_SUBDIRS+=	nullfs	# XXX: needs rump
 # fusefs tests cannot be compiled/used without the googletest infrastructure.
 .if ${COMPILER_FEATURES:Mc++14} && ${MK_GOOGLETEST} != "no"
+# Don't build fusefs tests for MIPS while LLVM PR 43263 is active, as part
+# of the fusefs tests trigger excessively long compile time.  The build does
+# eventually succeed, but it's perhaps better to not do so by default for now.
+.if ${MACHINE_CPUARCH} != "mips" || ${COMPILER_TYPE} != "clang"
 TESTS_SUBDIRS+=		fusefs
+.endif
 .endif
 TESTS_SUBDIRS+=		tmpfs