From owner-svn-src-head@freebsd.org Mon Jan 6 18:25:59 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 445AF1DD58E; Mon, 6 Jan 2020 18:25:59 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47s3qC18FKz43FZ; Mon, 6 Jan 2020 18:25:59 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 227D31A78D; Mon, 6 Jan 2020 18:25:59 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 006IPxrA066285; Mon, 6 Jan 2020 18:25:59 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 006IPwrP066283; Mon, 6 Jan 2020 18:25:58 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202001061825.006IPwrP066283@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Mon, 6 Jan 2020 18:25:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356423 - in head: share/mk tests/sys/fs X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head: share/mk tests/sys/fs X-SVN-Commit-Revision: 356423 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jan 2020 18:25:59 -0000 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