From owner-svn-src-projects@freebsd.org Tue Feb 19 03:46:39 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 750A214DB376 for ; Tue, 19 Feb 2019 03:46:39 +0000 (UTC) (envelope-from ngie@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 1F1DD6A2FA; Tue, 19 Feb 2019 03:46:39 +0000 (UTC) (envelope-from ngie@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 0F6E118166; Tue, 19 Feb 2019 03:46:39 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1J3kcRX055400; Tue, 19 Feb 2019 03:46:38 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1J3kWhD055366; Tue, 19 Feb 2019 03:46:32 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902190346.x1J3kWhD055366@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Tue, 19 Feb 2019 03:46:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344271 - in projects/import-googletest-1.8.1: . contrib/libarchive/libarchive contrib/libc++/include contrib/llvm/lib/MC etc/mtree kerberos5/tools/asn1_compile kerberos5/tools/slc lib/... X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1: . contrib/libarchive/libarchive contrib/libc++/include contrib/llvm/lib/MC etc/mtree kerberos5/tools/asn1_compile kerberos5/tools/slc lib/clang lib/clang/libllvmmi... X-SVN-Commit-Revision: 344271 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1F1DD6A2FA X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Feb 2019 03:46:39 -0000 Author: ngie Date: Tue Feb 19 03:46:32 2019 New Revision: 344271 URL: https://svnweb.freebsd.org/changeset/base/344271 Log: MFhead@r344270 Added: projects/import-googletest-1.8.1/lib/libc/x86/gen/ - copied from r344270, head/lib/libc/x86/gen/ projects/import-googletest-1.8.1/sys/opencrypto/cbc_mac.c - copied unchanged from r344270, head/sys/opencrypto/cbc_mac.c projects/import-googletest-1.8.1/sys/opencrypto/cbc_mac.h - copied unchanged from r344270, head/sys/opencrypto/cbc_mac.h projects/import-googletest-1.8.1/sys/opencrypto/xform_cbc_mac.c - copied unchanged from r344270, head/sys/opencrypto/xform_cbc_mac.c projects/import-googletest-1.8.1/tools/build/options/WITHOUT_PIE - copied unchanged from r344270, head/tools/build/options/WITHOUT_PIE projects/import-googletest-1.8.1/tools/build/options/WITH_PIE - copied unchanged from r344270, head/tools/build/options/WITH_PIE Deleted: projects/import-googletest-1.8.1/lib/libc/amd64/gen/getcontextx.c projects/import-googletest-1.8.1/lib/libc/i386/gen/getcontextx.c Modified: projects/import-googletest-1.8.1/UPDATING projects/import-googletest-1.8.1/contrib/libarchive/libarchive/archive_read_disk_posix.c projects/import-googletest-1.8.1/contrib/libc++/include/type_traits projects/import-googletest-1.8.1/contrib/llvm/lib/MC/ELFObjectWriter.cpp projects/import-googletest-1.8.1/etc/mtree/BSD.root.dist projects/import-googletest-1.8.1/kerberos5/tools/asn1_compile/Makefile projects/import-googletest-1.8.1/kerberos5/tools/slc/Makefile projects/import-googletest-1.8.1/lib/clang/Makefile.inc projects/import-googletest-1.8.1/lib/clang/libllvmminimal/Makefile projects/import-googletest-1.8.1/lib/libbe/be.c projects/import-googletest-1.8.1/lib/libbe/be.h projects/import-googletest-1.8.1/lib/libbe/be_error.c projects/import-googletest-1.8.1/lib/libbe/libbe.3 projects/import-googletest-1.8.1/lib/libc/Makefile projects/import-googletest-1.8.1/lib/libc/amd64/gen/Makefile.inc projects/import-googletest-1.8.1/lib/libc/gen/readpassphrase.3 projects/import-googletest-1.8.1/lib/libc/i386/gen/Makefile.inc projects/import-googletest-1.8.1/lib/libc/sys/sendfile.2 projects/import-googletest-1.8.1/lib/libc/x86/sys/__vdso_gettc.c projects/import-googletest-1.8.1/lib/libmemstat/memstat_uma.c projects/import-googletest-1.8.1/lib/libthr/arch/powerpc/include/pthread_md.h projects/import-googletest-1.8.1/libexec/rc/rc.d/nfsd projects/import-googletest-1.8.1/libexec/rtld-elf/Makefile projects/import-googletest-1.8.1/sbin/mdmfs/mdmfs.c projects/import-googletest-1.8.1/sbin/nvmecontrol/firmware.c projects/import-googletest-1.8.1/share/man/man5/src.conf.5 projects/import-googletest-1.8.1/share/mk/bsd.lib.mk projects/import-googletest-1.8.1/share/mk/bsd.opts.mk projects/import-googletest-1.8.1/share/mk/bsd.prog.mk projects/import-googletest-1.8.1/share/mk/src.libnames.mk projects/import-googletest-1.8.1/stand/common/dev_net.c projects/import-googletest-1.8.1/stand/common/disk.c projects/import-googletest-1.8.1/stand/common/part.c projects/import-googletest-1.8.1/stand/i386/Makefile.inc projects/import-googletest-1.8.1/stand/i386/zfsboot/zfsboot.c projects/import-googletest-1.8.1/stand/libsa/cd9660.c projects/import-googletest-1.8.1/stand/libsa/zfs/zfs.c projects/import-googletest-1.8.1/stand/lua/password.lua projects/import-googletest-1.8.1/stand/powerpc/uboot/Makefile projects/import-googletest-1.8.1/stand/uboot/common/main.c projects/import-googletest-1.8.1/stand/uboot/lib/libuboot.h projects/import-googletest-1.8.1/sys/amd64/amd64/pmap.c projects/import-googletest-1.8.1/sys/amd64/sgx/sgx_linux.c projects/import-googletest-1.8.1/sys/arm/allwinner/axp81x.c projects/import-googletest-1.8.1/sys/arm/arm/elf_machdep.c projects/import-googletest-1.8.1/sys/arm/freescale/imx/imx6_snvs.c projects/import-googletest-1.8.1/sys/arm64/arm64/elf_machdep.c projects/import-googletest-1.8.1/sys/conf/NOTES projects/import-googletest-1.8.1/sys/conf/files projects/import-googletest-1.8.1/sys/conf/ldscript.riscv projects/import-googletest-1.8.1/sys/contrib/libnv/nvpair.c projects/import-googletest-1.8.1/sys/dev/ata/ata-all.h projects/import-googletest-1.8.1/sys/dev/ena/ena.c projects/import-googletest-1.8.1/sys/dev/ena/ena.h projects/import-googletest-1.8.1/sys/dev/ixl/if_ixl.c projects/import-googletest-1.8.1/sys/dev/ixl/ixl_pf.h projects/import-googletest-1.8.1/sys/dev/netmap/netmap_freebsd.c projects/import-googletest-1.8.1/sys/dev/netmap/netmap_kern.h projects/import-googletest-1.8.1/sys/fs/fuse/fuse_internal.c projects/import-googletest-1.8.1/sys/fs/fuse/fuse_internal.h projects/import-googletest-1.8.1/sys/fs/fuse/fuse_io.c projects/import-googletest-1.8.1/sys/fs/fuse/fuse_ipc.h projects/import-googletest-1.8.1/sys/fs/fuse/fuse_node.c projects/import-googletest-1.8.1/sys/fs/fuse/fuse_node.h projects/import-googletest-1.8.1/sys/fs/fuse/fuse_vfsops.c projects/import-googletest-1.8.1/sys/fs/fuse/fuse_vnops.c projects/import-googletest-1.8.1/sys/i386/include/cpufunc.h projects/import-googletest-1.8.1/sys/kern/kern_resource.c projects/import-googletest-1.8.1/sys/kern/sys_pipe.c projects/import-googletest-1.8.1/sys/mips/mips/elf_machdep.c projects/import-googletest-1.8.1/sys/modules/crypto/Makefile projects/import-googletest-1.8.1/sys/net/if_lagg.c projects/import-googletest-1.8.1/sys/net/if_vlan.c projects/import-googletest-1.8.1/sys/net/iflib.c projects/import-googletest-1.8.1/sys/netinet/in_pcb.c projects/import-googletest-1.8.1/sys/netinet/tcp_timewait.c projects/import-googletest-1.8.1/sys/opencrypto/cryptodev.c projects/import-googletest-1.8.1/sys/opencrypto/cryptodev.h projects/import-googletest-1.8.1/sys/opencrypto/cryptosoft.c projects/import-googletest-1.8.1/sys/opencrypto/xform_aes_icm.c projects/import-googletest-1.8.1/sys/opencrypto/xform_auth.h projects/import-googletest-1.8.1/sys/opencrypto/xform_enc.h projects/import-googletest-1.8.1/sys/powerpc/booke/pmap.c projects/import-googletest-1.8.1/sys/powerpc/powerpc/elf32_machdep.c projects/import-googletest-1.8.1/sys/powerpc/powerpc/elf64_machdep.c projects/import-googletest-1.8.1/sys/powerpc/powerpc/exec_machdep.c projects/import-googletest-1.8.1/sys/riscv/include/param.h projects/import-googletest-1.8.1/sys/riscv/include/pcb.h projects/import-googletest-1.8.1/sys/riscv/include/pcpu.h projects/import-googletest-1.8.1/sys/riscv/include/pmap.h projects/import-googletest-1.8.1/sys/riscv/include/pte.h projects/import-googletest-1.8.1/sys/riscv/include/vmparam.h projects/import-googletest-1.8.1/sys/riscv/riscv/elf_machdep.c projects/import-googletest-1.8.1/sys/riscv/riscv/genassym.c projects/import-googletest-1.8.1/sys/riscv/riscv/machdep.c projects/import-googletest-1.8.1/sys/riscv/riscv/mp_machdep.c projects/import-googletest-1.8.1/sys/riscv/riscv/pmap.c projects/import-googletest-1.8.1/sys/riscv/riscv/swtch.S projects/import-googletest-1.8.1/sys/riscv/riscv/vm_machdep.c projects/import-googletest-1.8.1/sys/sparc64/sparc64/elf_machdep.c projects/import-googletest-1.8.1/sys/vm/vm_fault.c projects/import-googletest-1.8.1/sys/vm/vm_map.c projects/import-googletest-1.8.1/sys/vm/vm_pageout.c projects/import-googletest-1.8.1/sys/vm/vnode_pager.c projects/import-googletest-1.8.1/tools/build/mk/OptionalObsoleteFiles.inc projects/import-googletest-1.8.1/tools/tools/crypto/cryptocheck.c projects/import-googletest-1.8.1/usr.bin/clang/Makefile.inc projects/import-googletest-1.8.1/usr.bin/kdump/kdump.c projects/import-googletest-1.8.1/usr.bin/svn/Makefile.inc projects/import-googletest-1.8.1/usr.sbin/bhyve/block_if.c projects/import-googletest-1.8.1/usr.sbin/bhyve/pci_xhci.c (contents, props changed) projects/import-googletest-1.8.1/usr.sbin/bsdinstall/partedit/partedit_powerpc.c projects/import-googletest-1.8.1/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c projects/import-googletest-1.8.1/usr.sbin/nfsd/nfsd.8 projects/import-googletest-1.8.1/usr.sbin/nfsd/nfsd.c projects/import-googletest-1.8.1/usr.sbin/rpc.ypupdated/update.c projects/import-googletest-1.8.1/usr.sbin/wlandebug/Makefile Directory Properties: projects/import-googletest-1.8.1/ (props changed) projects/import-googletest-1.8.1/contrib/libarchive/ (props changed) projects/import-googletest-1.8.1/contrib/libc++/ (props changed) projects/import-googletest-1.8.1/contrib/llvm/ (props changed) Modified: projects/import-googletest-1.8.1/UPDATING ============================================================================== --- projects/import-googletest-1.8.1/UPDATING Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/UPDATING Tue Feb 19 03:46:32 2019 (r344271) @@ -38,6 +38,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: modules on kernels not having 'device iflib', the iflib.ko module is loaded automatically. +20190125: + The IEEE80211_AMPDU_AGE and AH_SUPPORT_AR5416 kernel configuration + options no longer exist since r343219 and r343427 respectively; + nothing uses them, so they should be just removed from custom + kernel config files. + 20181230: r342635 changes the way efibootmgr(8) works by requiring users to add the -b (bootnum) parameter for commands where the bootnum was previously @@ -231,7 +237,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: 20180719: ARM64 now have efifb support, if you want to have serial console on your arm64 board when an screen is connected and the bootloader - setup a frambuffer for us to use, just add : + setup a framebuffer for us to use, just add : boot_serial=YES boot_multicons=YES in /boot/loader.conf Modified: projects/import-googletest-1.8.1/contrib/libarchive/libarchive/archive_read_disk_posix.c ============================================================================== --- projects/import-googletest-1.8.1/contrib/libarchive/libarchive/archive_read_disk_posix.c Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/contrib/libarchive/libarchive/archive_read_disk_posix.c Tue Feb 19 03:46:32 2019 (r344271) @@ -860,6 +860,7 @@ next_entry(struct archive_read_disk *a, struct tree *t struct archive_string delayed_str; delayed = ARCHIVE_OK; + delayed_errno = 0; archive_string_init(&delayed_str); st = NULL; Modified: projects/import-googletest-1.8.1/contrib/libc++/include/type_traits ============================================================================== --- projects/import-googletest-1.8.1/contrib/libc++/include/type_traits Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/contrib/libc++/include/type_traits Tue Feb 19 03:46:32 2019 (r344271) @@ -733,12 +733,6 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_integral_ // is_floating_point template struct __libcpp_is_floating_point : public false_type {}; -#ifdef __clang__ -template <> struct __libcpp_is_floating_point<__fp16> : public true_type {}; -#endif -#ifdef __FLT16_MANT_DIG__ -template <> struct __libcpp_is_floating_point<_Float16> : public true_type {}; -#endif template <> struct __libcpp_is_floating_point : public true_type {}; template <> struct __libcpp_is_floating_point : public true_type {}; template <> struct __libcpp_is_floating_point : public true_type {}; Modified: projects/import-googletest-1.8.1/contrib/llvm/lib/MC/ELFObjectWriter.cpp ============================================================================== --- projects/import-googletest-1.8.1/contrib/llvm/lib/MC/ELFObjectWriter.cpp Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/contrib/llvm/lib/MC/ELFObjectWriter.cpp Tue Feb 19 03:46:32 2019 (r344271) @@ -1258,14 +1258,20 @@ void ELFObjectWriter::executePostLayoutBinding(MCAssem if (!Symbol.isUndefined() && !Rest.startswith("@@@")) continue; - // FIXME: produce a better error message. + // FIXME: Get source locations for these errors or diagnose them earlier. if (Symbol.isUndefined() && Rest.startswith("@@") && - !Rest.startswith("@@@")) - report_fatal_error("A @@ version cannot be undefined"); + !Rest.startswith("@@@")) { + Asm.getContext().reportError(SMLoc(), "versioned symbol " + AliasName + + " must be defined"); + continue; + } - if (Renames.count(&Symbol) && Renames[&Symbol] != Alias) - report_fatal_error(llvm::Twine("Multiple symbol versions defined for ") + - Symbol.getName()); + if (Renames.count(&Symbol) && Renames[&Symbol] != Alias) { + Asm.getContext().reportError( + SMLoc(), llvm::Twine("multiple symbol versions defined for ") + + Symbol.getName()); + continue; + } Renames.insert(std::make_pair(&Symbol, Alias)); } Modified: projects/import-googletest-1.8.1/etc/mtree/BSD.root.dist ============================================================================== --- projects/import-googletest-1.8.1/etc/mtree/BSD.root.dist Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/etc/mtree/BSD.root.dist Tue Feb 19 03:46:32 2019 (r344271) @@ -26,6 +26,8 @@ .. modules .. + uboot + .. zfs .. .. Modified: projects/import-googletest-1.8.1/kerberos5/tools/asn1_compile/Makefile ============================================================================== --- projects/import-googletest-1.8.1/kerberos5/tools/asn1_compile/Makefile Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/kerberos5/tools/asn1_compile/Makefile Tue Feb 19 03:46:32 2019 (r344271) @@ -6,6 +6,7 @@ LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a LIBADD= vers LDADD= ${LIBROKEN_A} DPADD= ${LIBROKEN_A} +MK_PIE:= no SRCS= \ asn1parse.y \ Modified: projects/import-googletest-1.8.1/kerberos5/tools/slc/Makefile ============================================================================== --- projects/import-googletest-1.8.1/kerberos5/tools/slc/Makefile Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/kerberos5/tools/slc/Makefile Tue Feb 19 03:46:32 2019 (r344271) @@ -6,6 +6,7 @@ LIBADD= vers LDADD= ${LIBROKEN_A} DPADD= ${LIBROKEN_A} MAN= +MK_PIE:= no SRCS= roken.h \ slc-gram.y \ Modified: projects/import-googletest-1.8.1/lib/clang/Makefile.inc ============================================================================== --- projects/import-googletest-1.8.1/lib/clang/Makefile.inc Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/lib/clang/Makefile.inc Tue Feb 19 03:46:32 2019 (r344271) @@ -2,6 +2,8 @@ .include +MK_PIE:= no # Explicit libXXX.a references + .if ${COMPILER_TYPE} == "clang" DEBUG_FILES_CFLAGS= -gline-tables-only .else Modified: projects/import-googletest-1.8.1/lib/clang/libllvmminimal/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/clang/libllvmminimal/Makefile Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/lib/clang/libllvmminimal/Makefile Tue Feb 19 03:46:32 2019 (r344271) @@ -18,6 +18,7 @@ SRCS+= Support/Errno.cpp SRCS+= Support/Error.cpp SRCS+= Support/ErrorHandling.cpp SRCS+= Support/FoldingSet.cpp +SRCS+= Support/FormatVariadic.cpp SRCS+= Support/FormattedStream.cpp SRCS+= Support/Hashing.cpp SRCS+= Support/Host.cpp Modified: projects/import-googletest-1.8.1/lib/libbe/be.c ============================================================================== --- projects/import-googletest-1.8.1/lib/libbe/be.c Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/lib/libbe/be.c Tue Feb 19 03:46:32 2019 (r344271) @@ -45,6 +45,11 @@ __FBSDID("$FreeBSD$"); #include "be.h" #include "be_impl.h" +struct be_destroy_data { + libbe_handle_t *lbh; + char *snapname; +}; + #if SOON static int be_create_child_noent(libbe_handle_t *lbh, const char *active, const char *child_path); @@ -186,12 +191,38 @@ be_nicenum(uint64_t num, char *buf, size_t buflen) static int be_destroy_cb(zfs_handle_t *zfs_hdl, void *data) { + char path[BE_MAXPATHLEN]; + struct be_destroy_data *bdd; + zfs_handle_t *snap; int err; - if ((err = zfs_iter_children(zfs_hdl, be_destroy_cb, data)) != 0) + bdd = (struct be_destroy_data *)data; + if (bdd->snapname == NULL) { + err = zfs_iter_children(zfs_hdl, be_destroy_cb, data); + if (err != 0) + return (err); + return (zfs_destroy(zfs_hdl, false)); + } + /* If we're dealing with snapshots instead, delete that one alone */ + err = zfs_iter_filesystems(zfs_hdl, be_destroy_cb, data); + if (err != 0) return (err); - if ((err = zfs_destroy(zfs_hdl, false)) != 0) - return (err); + /* + * This part is intentionally glossing over any potential errors, + * because there's a lot less potential for errors when we're cleaning + * up snapshots rather than a full deep BE. The primary error case + * here being if the snapshot doesn't exist in the first place, which + * the caller will likely deem insignificant as long as it doesn't + * exist after the call. Thus, such a missing snapshot shouldn't jam + * up the destruction. + */ + snprintf(path, sizeof(path), "%s@%s", zfs_get_name(zfs_hdl), + bdd->snapname); + if (!zfs_dataset_exists(bdd->lbh->lzh, path, ZFS_TYPE_SNAPSHOT)) + return (0); + snap = zfs_open(bdd->lbh->lzh, path, ZFS_TYPE_SNAPSHOT); + if (snap != NULL) + zfs_destroy(snap, false); return (0); } @@ -199,22 +230,26 @@ be_destroy_cb(zfs_handle_t *zfs_hdl, void *data) * Destroy the boot environment or snapshot specified by the name * parameter. Options are or'd together with the possible values: * BE_DESTROY_FORCE : forces operation on mounted datasets + * BE_DESTROY_ORIGIN: destroy the origin snapshot as well */ int be_destroy(libbe_handle_t *lbh, const char *name, int options) { + struct be_destroy_data bdd; char origin[BE_MAXPATHLEN], path[BE_MAXPATHLEN]; zfs_handle_t *fs; - char *p; + char *snapdelim; int err, force, mounted; + size_t rootlen; - p = path; + bdd.lbh = lbh; + bdd.snapname = NULL; force = options & BE_DESTROY_FORCE; *origin = '\0'; be_root_concat(lbh, name, path); - if (strchr(name, '@') == NULL) { + if ((snapdelim = strchr(path, '@')) == NULL) { if (!zfs_dataset_exists(lbh->lzh, path, ZFS_TYPE_FILESYSTEM)) return (set_error(lbh, BE_ERR_NOENT)); @@ -222,9 +257,10 @@ be_destroy(libbe_handle_t *lbh, const char *name, int strcmp(path, lbh->bootfs) == 0) return (set_error(lbh, BE_ERR_DESTROYACT)); - fs = zfs_open(lbh->lzh, p, ZFS_TYPE_FILESYSTEM); + fs = zfs_open(lbh->lzh, path, ZFS_TYPE_FILESYSTEM); if (fs == NULL) return (set_error(lbh, BE_ERR_ZFSOPEN)); + if ((options & BE_DESTROY_ORIGIN) != 0 && zfs_prop_get(fs, ZFS_PROP_ORIGIN, origin, sizeof(origin), NULL, NULL, 0, 1) != 0) @@ -233,40 +269,56 @@ be_destroy(libbe_handle_t *lbh, const char *name, int if (!zfs_dataset_exists(lbh->lzh, path, ZFS_TYPE_SNAPSHOT)) return (set_error(lbh, BE_ERR_NOENT)); - fs = zfs_open(lbh->lzh, p, ZFS_TYPE_SNAPSHOT); - if (fs == NULL) + bdd.snapname = strdup(snapdelim + 1); + if (bdd.snapname == NULL) + return (set_error(lbh, BE_ERR_NOMEM)); + *snapdelim = '\0'; + fs = zfs_open(lbh->lzh, path, ZFS_TYPE_DATASET); + if (fs == NULL) { + free(bdd.snapname); return (set_error(lbh, BE_ERR_ZFSOPEN)); + } } /* Check if mounted, unmount if force is specified */ if ((mounted = zfs_is_mounted(fs, NULL)) != 0) { - if (force) + if (force) { zfs_unmount(fs, NULL, 0); - else + } else { + free(bdd.snapname); return (set_error(lbh, BE_ERR_DESTROYMNT)); + } } - if ((err = be_destroy_cb(fs, NULL)) != 0) { + err = be_destroy_cb(fs, &bdd); + zfs_close(fs); + free(bdd.snapname); + if (err != 0) { /* Children are still present or the mount is referenced */ if (err == EBUSY) return (set_error(lbh, BE_ERR_DESTROYMNT)); return (set_error(lbh, BE_ERR_UNKNOWN)); } - if (*origin != '\0') { - fs = zfs_open(lbh->lzh, origin, ZFS_TYPE_SNAPSHOT); - if (fs == NULL) - return (set_error(lbh, BE_ERR_ZFSOPEN)); - err = zfs_destroy(fs, false); - if (err == EBUSY) - return (set_error(lbh, BE_ERR_DESTROYMNT)); - else if (err != 0) - return (set_error(lbh, BE_ERR_UNKNOWN)); - } + if ((options & BE_DESTROY_ORIGIN) == 0) + return (0); - return (0); -} + /* The origin can't possibly be shorter than the BE root */ + rootlen = strlen(lbh->root); + if (*origin == '\0' || strlen(origin) <= rootlen + 1) + return (set_error(lbh, BE_ERR_INVORIGIN)); + /* + * We'll be chopping off the BE root and running this back through + * be_destroy, so that we properly handle the origin snapshot whether + * it be that of a deep BE or not. + */ + if (strncmp(origin, lbh->root, rootlen) != 0 || origin[rootlen] != '/') + return (0); + + return (be_destroy(lbh, origin + rootlen + 1, + options & ~BE_DESTROY_ORIGIN)); +} int be_snapshot(libbe_handle_t *lbh, const char *source, const char *snap_name, Modified: projects/import-googletest-1.8.1/lib/libbe/be.h ============================================================================== --- projects/import-googletest-1.8.1/lib/libbe/be.h Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/lib/libbe/be.h Tue Feb 19 03:46:32 2019 (r344271) @@ -59,6 +59,7 @@ typedef enum be_error { BE_ERR_NOPOOL, /* operation not supported on this pool */ BE_ERR_NOMEM, /* insufficient memory */ BE_ERR_UNKNOWN, /* unknown error */ + BE_ERR_INVORIGIN, /* invalid origin */ } be_error_t; Modified: projects/import-googletest-1.8.1/lib/libbe/be_error.c ============================================================================== --- projects/import-googletest-1.8.1/lib/libbe/be_error.c Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/lib/libbe/be_error.c Tue Feb 19 03:46:32 2019 (r344271) @@ -105,6 +105,9 @@ libbe_error_description(libbe_handle_t *lbh) case BE_ERR_UNKNOWN: return ("unknown error"); + case BE_ERR_INVORIGIN: + return ("invalid origin"); + default: assert(lbh->error == BE_ERR_SUCCESS); return ("no error"); Modified: projects/import-googletest-1.8.1/lib/libbe/libbe.3 ============================================================================== --- projects/import-googletest-1.8.1/lib/libbe/libbe.3 Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/lib/libbe/libbe.3 Tue Feb 19 03:46:32 2019 (r344271) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 11, 2019 +.Dd February 12, 2019 .Dt LIBBE 3 .Os .Sh NAME @@ -489,6 +489,8 @@ BE_ERR_NOPOOL BE_ERR_NOMEM .It BE_ERR_UNKNOWN +.It +BE_ERR_INVORIGIN .El .Sh SEE ALSO .Xr bectl 8 Modified: projects/import-googletest-1.8.1/lib/libc/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/libc/Makefile Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/lib/libc/Makefile Tue Feb 19 03:46:32 2019 (r344271) @@ -122,6 +122,7 @@ NOASM= .endif .if ${LIBC_ARCH} == "i386" || ${LIBC_ARCH} == "amd64" .include "${LIBC_SRCTOP}/x86/sys/Makefile.inc" +.include "${LIBC_SRCTOP}/x86/gen/Makefile.inc" .endif .if ${MK_NIS} != "no" CFLAGS+= -DYP Modified: projects/import-googletest-1.8.1/lib/libc/amd64/gen/Makefile.inc ============================================================================== --- projects/import-googletest-1.8.1/lib/libc/amd64/gen/Makefile.inc Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/lib/libc/amd64/gen/Makefile.inc Tue Feb 19 03:46:32 2019 (r344271) @@ -2,7 +2,7 @@ # $FreeBSD$ SRCS+= _setjmp.S _set_tp.c rfork_thread.S setjmp.S sigsetjmp.S \ - fabs.S getcontextx.c \ + fabs.S \ infinity.c ldexp.c makecontext.c signalcontext.c \ flt_rounds.c fpgetmask.c fpsetmask.c fpgetprec.c fpsetprec.c \ fpgetround.c fpsetround.c fpgetsticky.c Modified: projects/import-googletest-1.8.1/lib/libc/gen/readpassphrase.3 ============================================================================== --- projects/import-googletest-1.8.1/lib/libc/gen/readpassphrase.3 Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/lib/libc/gen/readpassphrase.3 Tue Feb 19 03:46:32 2019 (r344271) @@ -178,4 +178,6 @@ extension and should not be used if portability is des The .Fn readpassphrase function first appeared in +.Fx 4.6 +and .Ox 2.9 . Modified: projects/import-googletest-1.8.1/lib/libc/i386/gen/Makefile.inc ============================================================================== --- projects/import-googletest-1.8.1/lib/libc/i386/gen/Makefile.inc Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/lib/libc/i386/gen/Makefile.inc Tue Feb 19 03:46:32 2019 (r344271) @@ -2,5 +2,5 @@ # $FreeBSD$ SRCS+= _ctx_start.S _setjmp.S _set_tp.c fabs.S \ - flt_rounds.c getcontextx.c infinity.c ldexp.c makecontext.c \ + flt_rounds.c infinity.c ldexp.c makecontext.c \ rfork_thread.S setjmp.S signalcontext.c sigsetjmp.S Modified: projects/import-googletest-1.8.1/lib/libc/sys/sendfile.2 ============================================================================== --- projects/import-googletest-1.8.1/lib/libc/sys/sendfile.2 Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/lib/libc/sys/sendfile.2 Tue Feb 19 03:46:32 2019 (r344271) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 25, 2019 +.Dd February 15, 2019 .Dt SENDFILE 2 .Os .Sh NAME @@ -224,6 +224,19 @@ implementation of .Fn sendfile is "zero-copy", meaning that it has been optimized so that copying of the file data is avoided. .Sh TUNING +.Ss physical paging buffers +.Fn sendfile +uses vnode pager to read file pages into memory. +The pager uses a pool of physical buffers to run its I/O operations. +When system runs out of pbufs, sendfile will block and report state +.Dq Li zonelimit . +Size of the pool can be tuned with +.Va vm.vnode_pbufs +.Xr loader.conf 5 +tunable and can be checked with +.Xr sysctl 8 +OID of the same name at runtime. +.Ss sendfile(2) buffers On some architectures, this system call internally uses a special .Fn sendfile buffer @@ -279,9 +292,11 @@ buffers usage respectively. These values may also be viewed through .Nm netstat Fl m . .Pp -If a value of zero is reported for -.Va kern.ipc.nsfbufs , -your architecture does not need to use +If +.Xr sysctl 8 +OID +.Va kern.ipc.nsfbufs +doesn't exist, your architecture does not need to use .Fn sendfile buffers because their task can be efficiently performed by the generic virtual memory structures. @@ -363,11 +378,13 @@ does not support The socket peer has closed the connection. .El .Sh SEE ALSO +.Xr loader.conf 5 , .Xr netstat 1 , .Xr open 2 , .Xr send 2 , .Xr socket 2 , .Xr writev 2 , +.Xr sysctl 8 , .Xr tuning 7 .Rs .%A K. Elmeleegy Modified: projects/import-googletest-1.8.1/lib/libc/x86/sys/__vdso_gettc.c ============================================================================== --- projects/import-googletest-1.8.1/lib/libc/x86/sys/__vdso_gettc.c Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/lib/libc/x86/sys/__vdso_gettc.c Tue Feb 19 03:46:32 2019 (r344271) @@ -54,31 +54,6 @@ __FBSDID("$FreeBSD$"); #include "libc_private.h" static void -cpuidp(u_int leaf, u_int p[4]) -{ - - __asm __volatile( -#if defined(__i386__) - " pushl %%ebx\n" -#endif - " cpuid\n" -#if defined(__i386__) - " movl %%ebx,%1\n" - " popl %%ebx" -#endif - : "=a" (p[0]), -#if defined(__i386__) - "=r" (p[1]), -#elif defined(__amd64__) - "=b" (p[1]), -#else -#error "Arch" -#endif - "=c" (p[2]), "=d" (p[3]) - : "0" (leaf)); -} - -static void rdtsc_mb_lfence(void) { @@ -100,12 +75,12 @@ rdtsc_mb_none(void) DEFINE_UIFUNC(static, void, rdtsc_mb, (void), static) { u_int p[4]; - /* Not a typo, string matches our cpuidp() registers use. */ + /* Not a typo, string matches our do_cpuid() registers use. */ static const char intel_id[] = "GenuntelineI"; if ((cpu_feature & CPUID_SSE2) == 0) return (rdtsc_mb_none); - cpuidp(0, p); + do_cpuid(0, p); return (memcmp(p + 1, intel_id, sizeof(intel_id) - 1) == 0 ? rdtsc_mb_lfence : rdtsc_mb_mfence); } Modified: projects/import-googletest-1.8.1/lib/libmemstat/memstat_uma.c ============================================================================== --- projects/import-googletest-1.8.1/lib/libmemstat/memstat_uma.c Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/lib/libmemstat/memstat_uma.c Tue Feb 19 03:46:32 2019 (r344271) @@ -213,6 +213,15 @@ retry: mtp->mt_numfrees += upsp->ups_frees; } + /* + * Values for uth_allocs and uth_frees frees are snap. + * It may happen that kernel reports that number of frees + * is greater than number of allocs. See counter(9) for + * details. + */ + if (mtp->mt_numallocs < mtp->mt_numfrees) + mtp->mt_numallocs = mtp->mt_numfrees; + mtp->mt_size = uthp->uth_size; mtp->mt_rsize = uthp->uth_rsize; mtp->mt_memalloced = mtp->mt_numallocs * uthp->uth_size; Modified: projects/import-googletest-1.8.1/lib/libthr/arch/powerpc/include/pthread_md.h ============================================================================== --- projects/import-googletest-1.8.1/lib/libthr/arch/powerpc/include/pthread_md.h Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/lib/libthr/arch/powerpc/include/pthread_md.h Tue Feb 19 03:46:32 2019 (r344271) @@ -72,14 +72,15 @@ _tcb_set(struct tcb *tcb) static __inline struct tcb * _tcb_get(void) { - register uint8_t *_tp; + register struct tcb *tcb; + #ifdef __powerpc64__ - __asm __volatile("mr %0,13" : "=r"(_tp)); + __asm __volatile("addi %0,13,%1" : "=r"(tcb) : "i"(-TP_OFFSET)); #else - __asm __volatile("mr %0,2" : "=r"(_tp)); + __asm __volatile("addi %0,2,%1" : "=r"(tcb) : "i"(-TP_OFFSET)); #endif - return ((struct tcb *)(_tp - TP_OFFSET)); + return (tcb); } static __inline struct pthread * Modified: projects/import-googletest-1.8.1/libexec/rc/rc.d/nfsd ============================================================================== --- projects/import-googletest-1.8.1/libexec/rc/rc.d/nfsd Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/libexec/rc/rc.d/nfsd Tue Feb 19 03:46:32 2019 (r344271) @@ -13,6 +13,7 @@ name="nfsd" desc="Remote NFS server" rcvar="nfs_server_enable" command="/usr/sbin/${name}" +nfs_server_vhost="" load_rc_config $name start_precmd="nfsd_precmd" @@ -20,6 +21,7 @@ sig_stop="USR1" nfsd_precmd() { + local _vhost rc_flags="${nfs_server_flags}" # Load the modules now, so that the vfs.nfsd sysctl @@ -46,6 +48,9 @@ nfsd_precmd() force_depend rpcbind || return 1 force_depend mountd || return 1 + if [ -n "${nfs_server_vhost}" ]; then + command_args="-V \"${nfs_server_vhost}\"" + fi } run_rc_command "$1" Modified: projects/import-googletest-1.8.1/libexec/rtld-elf/Makefile ============================================================================== --- projects/import-googletest-1.8.1/libexec/rtld-elf/Makefile Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/libexec/rtld-elf/Makefile Tue Feb 19 03:46:32 2019 (r344271) @@ -7,6 +7,7 @@ .include PACKAGE= clibs MK_BIND_NOW= no +MK_PIE= no # Always position independent using local rules MK_SSP= no CONFS= libmap.conf Modified: projects/import-googletest-1.8.1/sbin/mdmfs/mdmfs.c ============================================================================== --- projects/import-googletest-1.8.1/sbin/mdmfs/mdmfs.c Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/sbin/mdmfs/mdmfs.c Tue Feb 19 03:46:32 2019 (r344271) @@ -196,6 +196,7 @@ main(int argc, char **argv) usage(); mdtype = MD_MALLOC; have_mdtype = true; + argappend(&mdconfig_arg, "-o reserve"); break; case 'm': argappend(&newfs_arg, "-m %s", optarg); Modified: projects/import-googletest-1.8.1/sbin/nvmecontrol/firmware.c ============================================================================== --- projects/import-googletest-1.8.1/sbin/nvmecontrol/firmware.c Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/sbin/nvmecontrol/firmware.c Tue Feb 19 03:46:32 2019 (r344271) @@ -177,7 +177,7 @@ static void firmware(const struct nvme_function *nf, int argc, char *argv[]) { int fd = -1, slot = 0; - int a_flag, s_flag, f_flag; + int a_flag, f_flag; int activate_action, reboot_required; int opt; char *p, *image = NULL; @@ -188,7 +188,7 @@ firmware(const struct nvme_function *nf, int argc, cha uint8_t fw_slot1_ro, fw_num_slots; struct nvme_controller_data cdata; - a_flag = s_flag = f_flag = false; + a_flag = f_flag = false; while ((opt = getopt(argc, argv, "af:s:")) != -1) { switch (opt) { @@ -214,7 +214,6 @@ firmware(const struct nvme_function *nf, int argc, cha "7.\n", optarg); usage(nf); } - s_flag = true; break; case 'f': image = optarg; Modified: projects/import-googletest-1.8.1/share/man/man5/src.conf.5 ============================================================================== --- projects/import-googletest-1.8.1/share/man/man5/src.conf.5 Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/share/man/man5/src.conf.5 Tue Feb 19 03:46:32 2019 (r344271) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd January 31, 2019 +.Dd February 15, 2019 .Dt SRC.CONF 5 .Os .Sh NAME @@ -406,7 +406,8 @@ Set to build the Clang C/C++ compiler during the boots This is a default setting on amd64/amd64, arm/arm, arm/armv6, arm/armv7, arm64/aarch64 and i386/i386. .It Va WITH_CLANG_EXTRAS -Set to build additional clang and llvm tools, such as bugpoint. +Set to build additional clang and llvm tools, such as bugpoint and +clang-format. .It Va WITHOUT_CLANG_FULL Set to avoid building the ARCMigrate, Rewriter and StaticAnalyzer components of the Clang C/C++ compiler. @@ -1542,6 +1543,9 @@ When set, it enforces these options: .It .Va WITHOUT_AUTHPF .El +.It Va WITH_PIE +Build dynamically linked binaries as +Position-Independent Executable (PIE). .It Va WITHOUT_PKGBOOTSTRAP Set to not build .Xr pkg 7 Modified: projects/import-googletest-1.8.1/share/mk/bsd.lib.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/bsd.lib.mk Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/share/mk/bsd.lib.mk Tue Feb 19 03:46:32 2019 (r344271) @@ -91,13 +91,16 @@ CTFFLAGS+= -g # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries # .pico used for PIC object files # .nossppico used for NOSSP PIC object files -.SUFFIXES: .out .o .bc .ll .po .pico .nossppico .S .asm .s .c .cc .cpp .cxx .C .f .y .l .ln +# .pieo used for PIE object files +.SUFFIXES: .out .o .bc .ll .po .pico .nossppico .pieo .S .asm .s .c .cc .cpp .cxx .C .f .y .l .ln .if !defined(PICFLAG) .if ${MACHINE_CPUARCH} == "sparc64" PICFLAG=-fPIC +PIEFLAG=-fPIE .else PICFLAG=-fpic +PIEFLAG=-fpie .endif .endif @@ -115,6 +118,10 @@ PO_FLAG=-pg ${CC} ${PICFLAG} -DPIC ${SHARED_CFLAGS:C/^-fstack-protector.*$//} ${CFLAGS:C/^-fstack-protector.*$//} -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} +.c.pieo: + ${CC} ${PIEFLAG} -DPIC ${SHARED_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${CTFCONVERT_CMD} + .cc.po .C.po .cpp.po .cxx.po: ${CXX} ${PO_FLAG} ${STATIC_CXXFLAGS} ${PO_CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} @@ -124,6 +131,9 @@ PO_FLAG=-pg .cc.nossppico .C.nossppico .cpp.nossppico .cxx.nossppico: ${CXX} ${PICFLAG} -DPIC ${SHARED_CXXFLAGS:C/^-fstack-protector.*$//} ${CXXFLAGS:C/^-fstack-protector.*$//} -c ${.IMPSRC} -o ${.TARGET} +.cc.pieo .C.pieo .cpp.pieo .cxx.pieo: + ${CXX} ${PIEFLAG} ${SHARED_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} + .f.po: ${FC} -pg ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC} ${CTFCONVERT_CMD} @@ -136,7 +146,7 @@ PO_FLAG=-pg ${FC} ${PICFLAG} -DPIC ${FFLAGS:C/^-fstack-protector.*$//} -o ${.TARGET} -c ${.IMPSRC} ${CTFCONVERT_CMD} -.s.po .s.pico .s.nossppico: +.s.po .s.pico .s.nossppico .s.pieo: ${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC} ${CTFCONVERT_CMD} @@ -155,6 +165,11 @@ PO_FLAG=-pg ${CFLAGS:C/^-fstack-protector.*$//} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} +.asm.pieo: + ${CC:N${CCACHE_BIN}} -x assembler-with-cpp ${PIEFLAG} -DPIC \ + ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${CTFCONVERT_CMD} + .S.po: ${CC:N${CCACHE_BIN}} -DPROF ${PO_CFLAGS} ${ACFLAGS} -c ${.IMPSRC} \ -o ${.TARGET} @@ -170,6 +185,11 @@ PO_FLAG=-pg -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} +.S.pieo: + ${CC:N${CCACHE_BIN}} ${PIEFLAG} -DPIC ${CFLAGS} ${ACFLAGS} \ + -c ${.IMPSRC} -o ${.TARGET} + ${CTFCONVERT_CMD} + _LIBDIR:=${LIBDIR} _SHLIBDIR:=${SHLIBDIR} @@ -333,6 +353,20 @@ lib${LIB_PRIVATE}${LIB}_nossp_pic.a: ${NOSSPSOBJS} .endif .endif # !defined(INTERNALLIB) + +.if defined(INTERNALLIB) && ${MK_PIE} != "no" +PIEOBJS+= ${OBJS:.o=.pieo} +DEPENDOBJS+= ${PIEOBJS} +CLEANFILES+= ${PIEOBJS} + +_LIBS+= lib${LIB_PRIVATE}${LIB}_pie.a + +lib${LIB_PRIVATE}${LIB}_pie.a: ${PIEOBJS} + @${ECHO} building pie ${LIB} library + @rm -f ${.TARGET} + ${AR} ${ARFLAGS} ${.TARGET} ${PIEOBJS} ${ARADD} + ${RANLIB} ${RANLIBFLAGS} ${.TARGET} +.endif .if defined(_SKIP_BUILD) all: Modified: projects/import-googletest-1.8.1/share/mk/bsd.opts.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/bsd.opts.mk Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/share/mk/bsd.opts.mk Tue Feb 19 03:46:32 2019 (r344271) @@ -73,6 +73,7 @@ __DEFAULT_NO_OPTIONS = \ CCACHE_BUILD \ CTF \ INSTALL_AS_USER \ + PIE \ RETPOLINE \ STALE_STAGED Modified: projects/import-googletest-1.8.1/share/mk/bsd.prog.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/bsd.prog.mk Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/share/mk/bsd.prog.mk Tue Feb 19 03:46:32 2019 (r344271) @@ -38,11 +38,16 @@ MK_DEBUG_FILES= no .if ${MK_BIND_NOW} != "no" LDFLAGS+= -Wl,-znow .endif +.if ${MK_PIE} != "no" && (!defined(NO_SHARED) || ${NO_SHARED:tl} == "no") +CFLAGS+= -fPIE +CXXFLAGS+= -fPIE +LDFLAGS+= -pie +.endif .if ${MK_RETPOLINE} != "no" CFLAGS+= -mretpoline CXXFLAGS+= -mretpoline # retpolineplt is broken with static linking (PR 233336) -.if !defined(NO_SHARED) || ${NO_SHARED} == "no" || ${NO_SHARED} == "NO" +.if !defined(NO_SHARED) || ${NO_SHARED:tl} == "no" LDFLAGS+= -Wl,-zretpolineplt .endif .endif @@ -68,7 +73,7 @@ TAGS+= package=${PACKAGE:Uruntime} TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} .endif -.if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") +.if defined(NO_SHARED) && ${NO_SHARED:tl} != "no" LDFLAGS+= -static .endif Modified: projects/import-googletest-1.8.1/share/mk/src.libnames.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/src.libnames.mk Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/share/mk/src.libnames.mk Tue Feb 19 03:46:32 2019 (r344271) @@ -385,6 +385,10 @@ LDADD_gtest_main= -lprivategtest_main LIB${_l:tu}?= ${LIBDESTDIR}${LIBDIR_BASE}/libprivate${_l}.a .endfor +.if ${MK_PIE} != "no" +PIE_SUFFIX= _pie +.endif + .for _l in ${_LIBRARIES} .if ${_INTERNALLIBS:M${_l}} || !defined(SYSROOT) LDADD_${_l}_L+= -L${LIB${_l:tu}DIR} @@ -392,12 +396,14 @@ LDADD_${_l}_L+= -L${LIB${_l:tu}DIR} DPADD_${_l}?= ${LIB${_l:tu}} .if ${_PRIVATELIBS:M${_l}} LDADD_${_l}?= -lprivate${_l} +.elif ${_INTERNALLIBS:M${_l}} +LDADD_${_l}?= ${LDADD_${_l}_L} -l${_l:S/${PIE_SUFFIX}//}${PIE_SUFFIX} .else LDADD_${_l}?= ${LDADD_${_l}_L} -l${_l} .endif # Add in all dependencies for static linkage. .if defined(_DP_${_l}) && (${_INTERNALLIBS:M${_l}} || \ - (defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO"))) + (defined(NO_SHARED) && ${NO_SHARED:tl} != "no")) .for _d in ${_DP_${_l}} DPADD_${_l}+= ${DPADD_${_d}} LDADD_${_l}+= ${LDADD_${_d}} @@ -444,69 +450,69 @@ LDADD+= ${LDADD_${_l}} # INTERNALLIB definitions. LIBELFTCDIR= ${OBJTOP}/lib/libelftc -LIBELFTC?= ${LIBELFTCDIR}/libelftc.a +LIBELFTC?= ${LIBELFTCDIR}/libelftc${PIE_SUFFIX}.a LIBPEDIR= ${OBJTOP}/lib/libpe -LIBPE?= ${LIBPEDIR}/libpe.a +LIBPE?= ${LIBPEDIR}/libpe${PIE_SUFFIX}.a LIBOPENBSDDIR= ${OBJTOP}/lib/libopenbsd -LIBOPENBSD?= ${LIBOPENBSDDIR}/libopenbsd.a +LIBOPENBSD?= ${LIBOPENBSDDIR}/libopenbsd${PIE_SUFFIX}.a LIBSMDIR= ${OBJTOP}/lib/libsm -LIBSM?= ${LIBSMDIR}/libsm.a +LIBSM?= ${LIBSMDIR}/libsm${PIE_SUFFIX}.a LIBSMDBDIR= ${OBJTOP}/lib/libsmdb -LIBSMDB?= ${LIBSMDBDIR}/libsmdb.a +LIBSMDB?= ${LIBSMDBDIR}/libsmdb${PIE_SUFFIX}.a LIBSMUTILDIR= ${OBJTOP}/lib/libsmutil -LIBSMUTIL?= ${LIBSMUTILDIR}/libsmutil.a +LIBSMUTIL?= ${LIBSMUTILDIR}/libsmutil${PIE_SUFFIX}.a LIBNETBSDDIR?= ${OBJTOP}/lib/libnetbsd -LIBNETBSD?= ${LIBNETBSDDIR}/libnetbsd.a +LIBNETBSD?= ${LIBNETBSDDIR}/libnetbsd${PIE_SUFFIX}.a LIBVERSDIR?= ${OBJTOP}/kerberos5/lib/libvers -LIBVERS?= ${LIBVERSDIR}/libvers.a +LIBVERS?= ${LIBVERSDIR}/libvers${PIE_SUFFIX}.a LIBSLDIR= ${OBJTOP}/kerberos5/lib/libsl -LIBSL?= ${LIBSLDIR}/libsl.a +LIBSL?= ${LIBSLDIR}/libsl${PIE_SUFFIX}.a LIBIPFDIR= ${OBJTOP}/sbin/ipf/libipf -LIBIPF?= ${LIBIPFDIR}/libipf.a +LIBIPF?= ${LIBIPFDIR}/libipf${PIE_SUFFIX}.a LIBTELNETDIR= ${OBJTOP}/lib/libtelnet -LIBTELNET?= ${LIBTELNETDIR}/libtelnet.a +LIBTELNET?= ${LIBTELNETDIR}/libtelnet${PIE_SUFFIX}.a LIBCRONDIR= ${OBJTOP}/usr.sbin/cron/lib -LIBCRON?= ${LIBCRONDIR}/libcron.a +LIBCRON?= ${LIBCRONDIR}/libcron${PIE_SUFFIX}.a LIBNTPDIR= ${OBJTOP}/usr.sbin/ntp/libntp -LIBNTP?= ${LIBNTPDIR}/libntp.a +LIBNTP?= ${LIBNTPDIR}/libntp${PIE_SUFFIX}.a LIBNTPEVENTDIR= ${OBJTOP}/usr.sbin/ntp/libntpevent -LIBNTPEVENT?= ${LIBNTPEVENTDIR}/libntpevent.a +LIBNTPEVENT?= ${LIBNTPEVENTDIR}/libntpevent${PIE_SUFFIX}.a LIBOPTSDIR= ${OBJTOP}/usr.sbin/ntp/libopts -LIBOPTS?= ${LIBOPTSDIR}/libopts.a +LIBOPTS?= ${LIBOPTSDIR}/libopts${PIE_SUFFIX}.a LIBPARSEDIR= ${OBJTOP}/usr.sbin/ntp/libparse -LIBPARSE?= ${LIBPARSEDIR}/libparse.a +LIBPARSE?= ${LIBPARSEDIR}/libparse${PIE_SUFFIX}.a LIBLPRDIR= ${OBJTOP}/usr.sbin/lpr/common_source -LIBLPR?= ${LIBLPRDIR}/liblpr.a +LIBLPR?= ${LIBLPRDIR}/liblpr${PIE_SUFFIX}.a LIBFIFOLOGDIR= ${OBJTOP}/usr.sbin/fifolog/lib -LIBFIFOLOG?= ${LIBFIFOLOGDIR}/libfifolog.a +LIBFIFOLOG?= ${LIBFIFOLOGDIR}/libfifolog${PIE_SUFFIX}.a LIBBSNMPTOOLSDIR= ${OBJTOP}/usr.sbin/bsnmpd/tools/libbsnmptools -LIBBSNMPTOOLS?= ${LIBBSNMPTOOLSDIR}/libbsnmptools.a +LIBBSNMPTOOLS?= ${LIBBSNMPTOOLSDIR}/libbsnmptools${PIE_SUFFIX}.a LIBAMUDIR= ${OBJTOP}/usr.sbin/amd/libamu -LIBAMU?= ${LIBAMUDIR}/libamu.a +LIBAMU?= ${LIBAMUDIR}/libamu${PIE_SUFFIX}.a -LIBBE?= ${LIBBEDIR}/libbe.a +LIBBE?= ${LIBBEDIR}/libbe${PIE_SUFFIX}.a LIBPMCSTATDIR= ${OBJTOP}/lib/libpmcstat -LIBPMCSTAT?= ${LIBPMCSTATDIR}/libpmcstat.a +LIBPMCSTAT?= ${LIBPMCSTATDIR}/libpmcstat${PIE_SUFFIX}.a LIBC_NOSSP_PICDIR= ${OBJTOP}/lib/libc LIBC_NOSSP_PIC?= ${LIBC_NOSSP_PICDIR}/libc_nossp_pic.a Modified: projects/import-googletest-1.8.1/stand/common/dev_net.c ============================================================================== --- projects/import-googletest-1.8.1/stand/common/dev_net.c Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/stand/common/dev_net.c Tue Feb 19 03:46:32 2019 (r344271) @@ -122,13 +122,15 @@ net_open(struct open_file *f, ...) { struct iodesc *d; va_list args; - char *devname; /* Device part of file name (or NULL). */ + struct devdesc *dev; + const char *devname; /* Device part of file name (or NULL). */ int error = 0; va_start(args, f); - devname = va_arg(args, char*); + dev = va_arg(args, struct devdesc *); va_end(args); + devname = dev->d_dev->dv_name; /* Before opening another interface, close the previous one first. */ if (netdev_sock >= 0 && strcmp(devname, netdev_name) != 0) net_cleanup(); @@ -137,7 +139,7 @@ net_open(struct open_file *f, ...) if (netdev_opens == 0) { /* Find network interface. */ if (netdev_sock < 0) { - netdev_sock = netif_open(devname); + netdev_sock = netif_open(dev); if (netdev_sock < 0) { printf("net_open: netif_open() failed\n"); return (ENXIO); Modified: projects/import-googletest-1.8.1/stand/common/disk.c ============================================================================== --- projects/import-googletest-1.8.1/stand/common/disk.c Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/stand/common/disk.c Tue Feb 19 03:46:32 2019 (r344271) @@ -75,7 +75,7 @@ display_size(uint64_t size, u_int sectorsize) size /= 1024; unit = 'M'; } - sprintf(buf, "%ld%cB", (long)size, unit); + sprintf(buf, "%4ld%cB", (long)size, unit); return (buf); } @@ -102,7 +102,6 @@ ptblread(void *d, void *buf, size_t blocks, uint64_t o blocks * od->sectorsize, (char *)buf, NULL)); } -#define PWIDTH 35 static int ptable_print(void *arg, const char *pname, const struct ptable_entry *part) { @@ -112,16 +111,16 @@ ptable_print(void *arg, const char *pname, const struc struct ptable *table; char line[80]; int res; + u_int sectsize; + uint64_t partsize; pa = (struct print_args *)arg; od = (struct open_disk *)pa->dev->dd.d_opendata; - sprintf(line, " %s%s: %s", pa->prefix, pname, - parttype2str(part->type)); - if (pa->verbose) - sprintf(line, "%-*s%s", PWIDTH, line, - display_size(part->end - part->start + 1, - od->sectorsize)); - strcat(line, "\n"); + sectsize = od->sectorsize; + partsize = part->end - part->start + 1; + sprintf(line, " %s%s: %s\t%s\n", pa->prefix, pname, + parttype2str(part->type), + pa->verbose ? display_size(partsize, sectsize) : ""); if (pager_output(line)) return 1; res = 0; @@ -131,10 +130,15 @@ ptable_print(void *arg, const char *pname, const struc dev.dd.d_unit = pa->dev->dd.d_unit; dev.d_slice = part->index; dev.d_partition = -1; - if (disk_open(&dev, part->end - part->start + 1, - od->sectorsize) == 0) { - table = ptable_open(&dev, part->end - part->start + 1, - od->sectorsize, ptblread); + if (disk_open(&dev, partsize, sectsize) == 0) { + /* + * disk_open() for partition -1 on a bsd slice assumes + * you want the first bsd partition. Reset things so + * that we're looking at the start of the raw slice. + */ + dev.d_partition = -1; + dev.d_offset = part->start; + table = ptable_open(&dev, partsize, sectsize, ptblread); if (table != NULL) { sprintf(line, " %s%s", pa->prefix, pname); bsd.dev = pa->dev; @@ -149,7 +153,6 @@ ptable_print(void *arg, const char *pname, const struc return (res); } -#undef PWIDTH int disk_print(struct disk_devdesc *dev, char *prefix, int verbose) Modified: projects/import-googletest-1.8.1/stand/common/part.c ============================================================================== --- projects/import-googletest-1.8.1/stand/common/part.c Tue Feb 19 02:26:47 2019 (r344270) +++ projects/import-googletest-1.8.1/stand/common/part.c Tue Feb 19 03:46:32 2019 (r344271) @@ -788,6 +788,9 @@ ptable_close(struct ptable *table) { struct pentry *entry; + if (table == NULL) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Tue Feb 19 22:35:15 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 377E814DC545 for ; Tue, 19 Feb 2019 22:35:15 +0000 (UTC) (envelope-from ngie@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 C57F37797D; Tue, 19 Feb 2019 22:35:14 +0000 (UTC) (envelope-from ngie@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 B496E244D6; Tue, 19 Feb 2019 22:35:14 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1JMZEsG049136; Tue, 19 Feb 2019 22:35:14 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1JMZE1O049135; Tue, 19 Feb 2019 22:35:14 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902192235.x1JMZE1O049135@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Tue, 19 Feb 2019 22:35:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344311 - projects/import-googletest-1.8.1/contrib/mandoc X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/contrib/mandoc X-SVN-Commit-Revision: 344311 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C57F37797D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Feb 2019 22:35:15 -0000 Author: ngie Date: Tue Feb 19 22:35:14 2019 New Revision: 344311 URL: https://svnweb.freebsd.org/changeset/base/344311 Log: Add .Lb references for gmock/gtest These will be used in src.conf(5) changes--coming up next. Modified: projects/import-googletest-1.8.1/contrib/mandoc/lib.in Modified: projects/import-googletest-1.8.1/contrib/mandoc/lib.in ============================================================================== --- projects/import-googletest-1.8.1/contrib/mandoc/lib.in Tue Feb 19 22:19:31 2019 (r344310) +++ projects/import-googletest-1.8.1/contrib/mandoc/lib.in Tue Feb 19 22:35:14 2019 (r344311) @@ -62,7 +62,9 @@ LINE("libfsid", "Filesystem Identification Library (l LINE("libftpio", "FTP Connection Management Library (libftpio, \\-lftpio)") LINE("libform", "Curses Form Library (libform, \\-lform)") LINE("libgeom", "Userland API Library for Kernel GEOM subsystem (libgeom, \\-lgeom)") +LINE("libgmock", "GoogleMock library (libgmock, \\-lgmock)") LINE("libgpio", "General-Purpose Input Output (GPIO) library (libgpio, \\-lgpio)") +LINE("libgtest", "GoogleTest library (libgtest, \\-lgtest)") LINE("libhammer", "HAMMER Filesystem Userland Library (libhammer, \\-lhammer)") LINE("libi386", "i386 Architecture Library (libi386, \\-li386)") LINE("libintl", "Internationalized Message Handling Library (libintl, \\-lintl)") From owner-svn-src-projects@freebsd.org Tue Feb 19 22:40:34 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 154EF14DC64A for ; Tue, 19 Feb 2019 22:40:34 +0000 (UTC) (envelope-from ngie@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 834ED77B5B; Tue, 19 Feb 2019 22:40:33 +0000 (UTC) (envelope-from ngie@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 74613244E4; Tue, 19 Feb 2019 22:40:33 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1JMeXgX049406; Tue, 19 Feb 2019 22:40:33 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1JMeWWZ049403; Tue, 19 Feb 2019 22:40:32 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902192240.x1JMeWWZ049403@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Tue, 19 Feb 2019 22:40:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344312 - in projects/import-googletest-1.8.1: lib share/man/man5 share/mk tools/build/options X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1: lib share/man/man5 share/mk tools/build/options X-SVN-Commit-Revision: 344312 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 834ED77B5B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.979,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Feb 2019 22:40:34 -0000 Author: ngie Date: Tue Feb 19 22:40:32 2019 New Revision: 344312 URL: https://svnweb.freebsd.org/changeset/base/344312 Log: Add MK_GOOGLETEST option for building/installing gmock/gtest These libraries don't compile on non-C++-11 capable compilers, e.g., g++ 4.2.1 and its corresponding implementation of the c++ library, i.e., libstdc++. Blacklist compilation on all non-C++-11 capable compilers and give others the option of opting out of building/installing gmock/gtest via MK_GOOGLETEST. This option is controlled by MK_CXX and MK_TESTS, as ATF compilation is. Added: projects/import-googletest-1.8.1/tools/build/options/WITHOUT_GOOGLETEST (contents, props changed) Modified: projects/import-googletest-1.8.1/lib/Makefile projects/import-googletest-1.8.1/share/man/man5/src.conf.5 projects/import-googletest-1.8.1/share/mk/src.opts.mk Modified: projects/import-googletest-1.8.1/lib/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/Makefile Tue Feb 19 22:35:14 2019 (r344311) +++ projects/import-googletest-1.8.1/lib/Makefile Tue Feb 19 22:40:32 2019 (r344312) @@ -169,6 +169,7 @@ _libcplusplus+= libc++fs .endif SUBDIR.${MK_EFI}+= libefivar +SUBDIR.${MK_GOOGLETEST}+= googletest SUBDIR.${MK_LIBTHR}+= libthr SUBDIR.${MK_LLVM_LIBUNWIND}+= libgcc_eh SUBDIR.${MK_LLVM_LIBUNWIND}+= libgcc_s @@ -200,7 +201,6 @@ SUBDIR.${MK_RADIUS_SUPPORT}+= libradius SUBDIR.${MK_SENDMAIL}+= libmilter libsm libsmdb libsmutil SUBDIR.${MK_TELNET}+= libtelnet SUBDIR.${MK_TESTS_SUPPORT}+= atf -SUBDIR.${MK_TESTS_SUPPORT}+= googletest SUBDIR.${MK_TESTS}+= tests SUBDIR.${MK_UNBOUND}+= libunbound SUBDIR.${MK_USB}+= libusbhid libusb Modified: projects/import-googletest-1.8.1/share/man/man5/src.conf.5 ============================================================================== --- projects/import-googletest-1.8.1/share/man/man5/src.conf.5 Tue Feb 19 22:35:14 2019 (r344311) +++ projects/import-googletest-1.8.1/share/man/man5/src.conf.5 Tue Feb 19 22:40:32 2019 (r344312) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd February 15, 2019 +.Dd February 19, 2019 .Dt SRC.CONF 5 .Os .Sh NAME @@ -529,6 +529,8 @@ When set, it enforces these options: .It .Va WITHOUT_GNUCXX .It +.Va WITHOUT_GOOGLETEST +.It .Va WITHOUT_LLVM_COV .It .Va WITHOUT_TESTS @@ -807,6 +809,11 @@ Set to not build GNU Set this option to include GNU extensions in .Xr bsdgrep 1 by linking against libgnuregex. +.It Va WITHOUT_GOOGLETEST +Set to not build nor install +.Lb libgmock , +.Lb libgtest , +and dependent tests. .It Va WITHOUT_GPIO Set to not build .Xr gpioctl 8 @@ -1784,6 +1791,8 @@ When set, it enforces these options: .Bl -item -compact .It .Va WITHOUT_DTRACE_TESTS +.It +.Va WITHOUT_GOOGLETEST .El .Pp When set, these options are also in effect: Modified: projects/import-googletest-1.8.1/share/mk/src.opts.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/src.opts.mk Tue Feb 19 22:35:14 2019 (r344311) +++ projects/import-googletest-1.8.1/share/mk/src.opts.mk Tue Feb 19 22:40:32 2019 (r344312) @@ -108,6 +108,7 @@ __DEFAULT_YES_OPTIONS = \ GDB \ GNU_DIFF \ GNU_GREP \ + GOOGLETEST \ GPIO \ HAST \ HTML \ @@ -423,6 +424,7 @@ MK_${var}:= no # Order is somewhat important. # .if !${COMPILER_FEATURES:Mc++11} +MK_GOOGLETEST:= no MK_LLVM_LIBUNWIND:= no .endif @@ -505,6 +507,7 @@ MK_FREEBSD_UPDATE:= no .if ${MK_TESTS} == "no" MK_DTRACE_TESTS:= no +MK_GOOGLETEST:= no .endif .if ${MK_ZONEINFO} == "no" Added: projects/import-googletest-1.8.1/tools/build/options/WITHOUT_GOOGLETEST ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/import-googletest-1.8.1/tools/build/options/WITHOUT_GOOGLETEST Tue Feb 19 22:40:32 2019 (r344312) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build nor install +.Lb libgmock , +.Lb libgtest , +and dependent tests. From owner-svn-src-projects@freebsd.org Tue Feb 19 22:46:51 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9921014DC85A for ; Tue, 19 Feb 2019 22:46:51 +0000 (UTC) (envelope-from ngie@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 3794377F2D; Tue, 19 Feb 2019 22:46:51 +0000 (UTC) (envelope-from ngie@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 2906E24687; Tue, 19 Feb 2019 22:46:51 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1JMkokN054192; Tue, 19 Feb 2019 22:46:50 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1JMkofo054191; Tue, 19 Feb 2019 22:46:50 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902192246.x1JMkofo054191@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Tue, 19 Feb 2019 22:46:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344313 - projects/import-googletest-1.8.1/lib/googletest/gmock X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/lib/googletest/gmock X-SVN-Commit-Revision: 344313 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3794377F2D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Feb 2019 22:46:51 -0000 Author: ngie Date: Tue Feb 19 22:46:50 2019 New Revision: 344313 URL: https://svnweb.freebsd.org/changeset/base/344313 Log: Add missing INCSGROUPS definition This will install the gmock headers, like the gtest headers Modified: projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile Modified: projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile Tue Feb 19 22:40:32 2019 (r344312) +++ projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile Tue Feb 19 22:46:50 2019 (r344313) @@ -15,6 +15,8 @@ CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include LIBADD+= gtest LDFLAGS+= -L${.OBJDIR:H}/gtest +INCSGROUPS= MAIN_INCS INTERNAL_INCS INTERNAL_CUSTOM_INCS + MAIN_INCSDIR= ${INCLUDEDIR}/gmock MAIN_INCS+= gmock/gmock-matchers.h MAIN_INCS+= gmock/gmock-more-actions.h From owner-svn-src-projects@freebsd.org Wed Feb 20 00:10:57 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5A82414DEB53 for ; Wed, 20 Feb 2019 00:10:57 +0000 (UTC) (envelope-from ngie@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 F166783075; Wed, 20 Feb 2019 00:10:56 +0000 (UTC) (envelope-from ngie@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 E371B2546D; Wed, 20 Feb 2019 00:10:56 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K0Aulx098824; Wed, 20 Feb 2019 00:10:56 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K0AuLr098823; Wed, 20 Feb 2019 00:10:56 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200010.x1K0AuLr098823@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 00:10:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344321 - projects/import-googletest-1.8.1/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/share/mk X-SVN-Commit-Revision: 344321 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: F166783075 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 00:10:57 -0000 Author: ngie Date: Wed Feb 20 00:10:56 2019 New Revision: 344321 URL: https://svnweb.freebsd.org/changeset/base/344321 Log: Fix typos LIBGMOCK_MAIN and LIBGTEST_MAIN were missing corresponding underscores in the variable names. Modified: projects/import-googletest-1.8.1/share/mk/src.libnames.mk Modified: projects/import-googletest-1.8.1/share/mk/src.libnames.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/src.libnames.mk Tue Feb 19 23:53:33 2019 (r344320) +++ projects/import-googletest-1.8.1/share/mk/src.libnames.mk Wed Feb 20 00:10:56 2019 (r344321) @@ -373,9 +373,9 @@ LDADD_atf_c= -lprivateatf-c LDADD_atf_cxx= -lprivateatf-c++ LIBGMOCK= ${LIBDESTDIR}${LIBDIR_BASE}/libprivategmock.a +LIBGMOCK_MAIN= ${LIBDESTDIR}${LIBDIR_BASE}/libprivategmock_main.a LIBGTEST= ${LIBDESTDIR}${LIBDIR_BASE}/libprivategtest.a -LIBGMOCKMAIN= ${LIBDESTDIR}${LIBDIR_BASE}/libprivategmockmain.a -LIBGTESTMAIN= ${LIBDESTDIR}${LIBDIR_BASE}/libprivategtestmain.a +LIBGTEST_MAIN= ${LIBDESTDIR}${LIBDIR_BASE}/libprivategtest_main.a LDADD_gmock= -lprivategmock LDADD_gtest= -lprivategtest LDADD_gmock_main= -lprivategmock_main From owner-svn-src-projects@freebsd.org Wed Feb 20 00:12:25 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB66D14DED51 for ; Wed, 20 Feb 2019 00:12:25 +0000 (UTC) (envelope-from ngie@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 595BF832CE; Wed, 20 Feb 2019 00:12:25 +0000 (UTC) (envelope-from ngie@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 4CA14255DB; Wed, 20 Feb 2019 00:12:25 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K0CPEv001307; Wed, 20 Feb 2019 00:12:25 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K0CPJc001306; Wed, 20 Feb 2019 00:12:25 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200012.x1K0CPJc001306@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 00:12:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344322 - projects/import-googletest-1.8.1/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/share/mk X-SVN-Commit-Revision: 344322 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 595BF832CE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 00:12:25 -0000 Author: ngie Date: Wed Feb 20 00:12:24 2019 New Revision: 344322 URL: https://svnweb.freebsd.org/changeset/base/344322 Log: MK_GOOGLETEST should be enabled/disabled based on MK_TESTS_SUPPORT Making MK_GOOGLETEST rely on MK_TESTS makes it impossible to rely on in buildworld, which is not desirable for items like `cddl/usr.sbin/zfsd/tests`. Modified: projects/import-googletest-1.8.1/share/mk/src.opts.mk Modified: projects/import-googletest-1.8.1/share/mk/src.opts.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/src.opts.mk Wed Feb 20 00:10:56 2019 (r344321) +++ projects/import-googletest-1.8.1/share/mk/src.opts.mk Wed Feb 20 00:12:24 2019 (r344322) @@ -507,6 +507,9 @@ MK_FREEBSD_UPDATE:= no .if ${MK_TESTS} == "no" MK_DTRACE_TESTS:= no +.endif + +.if ${MK_TESTS_SUPPORT} == "no" MK_GOOGLETEST:= no .endif From owner-svn-src-projects@freebsd.org Wed Feb 20 00:15:26 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7317C14DEE98 for ; Wed, 20 Feb 2019 00:15:26 +0000 (UTC) (envelope-from ngie@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 15173834C9; Wed, 20 Feb 2019 00:15:26 +0000 (UTC) (envelope-from ngie@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 05B33255F5; Wed, 20 Feb 2019 00:15:26 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K0FPfn001470; Wed, 20 Feb 2019 00:15:25 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K0FPrM001469; Wed, 20 Feb 2019 00:15:25 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200015.x1K0FPrM001469@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 00:15:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344323 - projects/import-googletest-1.8.1/lib/googletest X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/lib/googletest X-SVN-Commit-Revision: 344323 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 15173834C9 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 00:15:26 -0000 Author: ngie Date: Wed Feb 20 00:15:25 2019 New Revision: 344323 URL: https://svnweb.freebsd.org/changeset/base/344323 Log: Unconditionally build/install libg{mock,test}_main They are supporting libraries and as such, will need to be built/installed when MK_TESTS == no during buildworld, i.e., the "make libraries" phase. Otherwise, dependent components cannot rely on the libraries, like `cddl/usr.sbin/zfsd/tests`. Modified: projects/import-googletest-1.8.1/lib/googletest/Makefile Modified: projects/import-googletest-1.8.1/lib/googletest/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/Makefile Wed Feb 20 00:12:24 2019 (r344322) +++ projects/import-googletest-1.8.1/lib/googletest/Makefile Wed Feb 20 00:15:25 2019 (r344323) @@ -3,8 +3,8 @@ SUBDIR+= gtest SUBDIR+= .WAIT SUBDIR+= gmock -SUBDIR.${MK_TESTS}+= .WAIT -SUBDIR.${MK_TESTS}+= gmock_main -SUBDIR.${MK_TESTS}+= gtest_main +SUBDIR+= .WAIT +SUBDIR+= gmock_main +SUBDIR+= gtest_main .include From owner-svn-src-projects@freebsd.org Wed Feb 20 00:19:12 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 55D0814DF371 for ; Wed, 20 Feb 2019 00:19:12 +0000 (UTC) (envelope-from ngie@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 EB82D83813; Wed, 20 Feb 2019 00:19:11 +0000 (UTC) (envelope-from ngie@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 C622A255F7; Wed, 20 Feb 2019 00:19:11 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K0JBZJ001655; Wed, 20 Feb 2019 00:19:11 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K0JBJ8001654; Wed, 20 Feb 2019 00:19:11 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200019.x1K0JBJ8001654@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 00:19:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344324 - in projects/import-googletest-1.8.1/lib/googletest: gmock_main gtest_main X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1/lib/googletest: gmock_main gtest_main X-SVN-Commit-Revision: 344324 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EB82D83813 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 00:19:12 -0000 Author: ngie Date: Wed Feb 20 00:19:11 2019 New Revision: 344324 URL: https://svnweb.freebsd.org/changeset/base/344324 Log: Fix up dependency finding for libg{mock,test}_main - Look up the corresponding non-*_main libraries via LDFLAGS using the directories provided in src.libnames.mk. This will allow the libraries to be built in the "make libraries" phase of buildworld. - gtest_main relies on gtest, but didn't explicitly call out the dependency in `LIBADD`. Fill in this missing blank. Modified: projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile Modified: projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile Wed Feb 20 00:15:25 2019 (r344323) +++ projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile Wed Feb 20 00:19:11 2019 (r344324) @@ -12,7 +12,11 @@ CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT}/include CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT} CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include -LIBADD= gmock +LIBADD+= gmock +# NB: LDFLAGS added for buildworld builds +LDFLAGS+= -L${LIBGTESTDIR} +LDFLAGS+= -L${LIBGMOCKDIR} + SRCS+= gmock_main.cc SUBDIR.${MK_TESTS}+= tests Modified: projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile Wed Feb 20 00:15:25 2019 (r344323) +++ projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile Wed Feb 20 00:19:11 2019 (r344324) @@ -11,6 +11,10 @@ PRIVATELIB= true CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include CXXFLAGS+= -I${GOOGLETEST_SRCROOT} +LIBADD+= gtest +# NB: LDFLAGS added for buildworld builds +LDFLAGS+= -L${LIBGTESTDIR} + SRCS+= gtest_main.cc SUBDIR.${MK_TESTS}+= tests From owner-svn-src-projects@freebsd.org Wed Feb 20 00:40:17 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 30A4014DF8B7 for ; Wed, 20 Feb 2019 00:40:17 +0000 (UTC) (envelope-from ngie@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 C7AC88415C; Wed, 20 Feb 2019 00:40:16 +0000 (UTC) (envelope-from ngie@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 B23DC25955; Wed, 20 Feb 2019 00:40:16 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K0eGrs012199; Wed, 20 Feb 2019 00:40:16 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K0eGTu012198; Wed, 20 Feb 2019 00:40:16 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200040.x1K0eGTu012198@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 00:40:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344326 - projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/tests X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/tests X-SVN-Commit-Revision: 344326 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C7AC88415C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 00:40:17 -0000 Author: ngie Date: Wed Feb 20 00:40:16 2019 New Revision: 344326 URL: https://svnweb.freebsd.org/changeset/base/344326 Log: Rely on gmock/gtest integration done in branch The previous logic made a number of assumptions which were required pre-buildworld integration of gmock/gtest, including looking for gmock/gtest out of tree. Remove the code now that the assumptions are no longer required, leveraging `LIBADD` instead. Modified: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/tests/Makefile Modified: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/tests/Makefile Wed Feb 20 00:25:45 2019 (r344325) +++ projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/tests/Makefile Wed Feb 20 00:40:16 2019 (r344326) @@ -11,22 +11,6 @@ SRCS= # Use #include in test programs. INCFLAGS+= -I${.CURDIR:H:H} -.if defined(DESTDIR) || defined(SYSROOT) -INCFLAGS+= -I${SYSROOT:U${DESTDIR}}/usr/include -LDFLAGS.zfsd_unittest+= -L${SYSROOT:U${DESTDIR}}/lib \ - -L${SYSROOT:U${DESTDIR}}/usr/lib -.endif - -# Googletest options -INCFLAGS+= -I${LOCALBASE}/include -D_THREAD_SAFE -pthread -LDFLAGS.zfsd_unittest+= -L${LOCALBASE}/lib -D_THREAD_SAFE -pthread -LDADD.zfsd_unittest+= ${LOCALBASE}/lib/libgtest.a - -# GoogleMock options -LDADD.zfsd_unittest+= ${LOCALBASE}/lib/libgmock.a ${LOCALBASE}/lib/libgmock_main.a - -# Googlemock fails if we don't have this line -# https://groups.google.com/forum/#!msg/googletestframework/h8ixEPCFm0o/amwfu4xGJb0J -CFLAGS.zfsd_unittest+= -DGTEST_HAS_PTHREAD +LIBDADD.zfsd_unittest+= gmock_main .include From owner-svn-src-projects@freebsd.org Wed Feb 20 00:40:58 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 886A414DF8DE for ; Wed, 20 Feb 2019 00:40:58 +0000 (UTC) (envelope-from ngie@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 2DCEA84287; Wed, 20 Feb 2019 00:40:58 +0000 (UTC) (envelope-from ngie@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 20D2D2596F; Wed, 20 Feb 2019 00:40:58 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K0evmt012268; Wed, 20 Feb 2019 00:40:57 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K0ev8e012267; Wed, 20 Feb 2019 00:40:57 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200040.x1K0ev8e012267@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 00:40:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344327 - projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd X-SVN-Commit-Revision: 344327 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2DCEA84287 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 00:40:58 -0000 Author: ngie Date: Wed Feb 20 00:40:57 2019 New Revision: 344327 URL: https://svnweb.freebsd.org/changeset/base/344327 Log: Build/install cddl/usr.sbin/zfsd/tests if MK_GOOGLETEST != no Modified: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile Modified: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile ============================================================================== --- projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile Wed Feb 20 00:40:16 2019 (r344326) +++ projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile Wed Feb 20 00:40:57 2019 (r344327) @@ -1,12 +1,12 @@ # $FreeBSD$ +.include + .include "Makefile.common" PROG_CXX= zfsd MAN= zfsd.8 -.include +SUBDIR.${MK_GOOGLETEST}+= tests -# The unittests require devel/googletest and devel/googlemock from ports. -# Don't automatically build them. -SUBDIR= +.include From owner-svn-src-projects@freebsd.org Wed Feb 20 01:09:04 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C6C7714E03F2 for ; Wed, 20 Feb 2019 01:09:04 +0000 (UTC) (envelope-from ngie@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 67A4D8501A; Wed, 20 Feb 2019 01:09:04 +0000 (UTC) (envelope-from ngie@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 5B0C325E63; Wed, 20 Feb 2019 01:09:04 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K194WO027730; Wed, 20 Feb 2019 01:09:04 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K193iH027727; Wed, 20 Feb 2019 01:09:03 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200109.x1K193iH027727@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 01:09:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344328 - projects/import-googletest-1.8.1/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/share/mk X-SVN-Commit-Revision: 344328 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 67A4D8501A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 01:09:05 -0000 Author: ngie Date: Wed Feb 20 01:09:03 2019 New Revision: 344328 URL: https://svnweb.freebsd.org/changeset/base/344328 Log: Add googletest.test.mk and integrate into bsd.test.mk googletest.test.mk is a rudimentary wrapper around the plain test interface (for now), which only supports C++ programs, specified by the `GTESTS` variable. In the future, kyua will support gtests in a more native manner. Added: projects/import-googletest-1.8.1/share/mk/googletest.test.mk (contents, props changed) Modified: projects/import-googletest-1.8.1/share/mk/Makefile projects/import-googletest-1.8.1/share/mk/bsd.test.mk Modified: projects/import-googletest-1.8.1/share/mk/Makefile ============================================================================== --- projects/import-googletest-1.8.1/share/mk/Makefile Wed Feb 20 00:40:57 2019 (r344327) +++ projects/import-googletest-1.8.1/share/mk/Makefile Wed Feb 20 01:09:03 2019 (r344328) @@ -73,6 +73,7 @@ FILESDIR= ${BINDIR}/mk .if ${MK_TESTS} != "no" FILES+= atf.test.mk +FILES+= googletest.test.mk FILES+= plain.test.mk FILES+= suite.test.mk FILES+= tap.test.mk Modified: projects/import-googletest-1.8.1/share/mk/bsd.test.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/bsd.test.mk Wed Feb 20 00:40:57 2019 (r344327) +++ projects/import-googletest-1.8.1/share/mk/bsd.test.mk Wed Feb 20 01:09:03 2019 (r344328) @@ -63,6 +63,7 @@ _TESTS= # Pull in the definitions of all supported test interfaces. .include +.include .include .include Added: projects/import-googletest-1.8.1/share/mk/googletest.test.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/import-googletest-1.8.1/share/mk/googletest.test.mk Wed Feb 20 01:09:03 2019 (r344328) @@ -0,0 +1,38 @@ +# $FreeBSD$ +# +# You must include bsd.test.mk instead of this file from your Makefile. +# +# Logic to build and install GoogleTest based test programs. +# +# GoogleTest is a C++ test framework, thus, it does not describe/articulate how +# to write tests in other languages, e.g., C or shell, unlike the ATF, plain, +# and TAP raw test interfaces. +# +# For now this is a thin wrapper around the `plain` test interface, but in the +# future this will rely on a newer version of kyua which will integrate in +# GoogleTest support. + +.if !target(____) +.error googletest.test.mk cannot be included directly. +.endif + +# List of GoogleTest test programs to build. +# +# Programs listed here are built according to the semantics of bsd.progs.mk for +# PROGS_CXX. +# +# Test programs registered in this manner are set to be installed into TESTSDIR +# (which should be overridden by the Makefile) and are not required to provide a +# manpage. +GTESTS?= + +.if !empty(GTESTS) +PROGS_CXX+= ${GTESTS} +_TESTS+= ${GTESTS} +.for _T in ${GTESTS} +BINDIR.${_T}= ${TESTSDIR} +MAN.${_T}?= # empty +SRCS.${_T}?= ${_T}.cc +TEST_INTERFACE.${_T}= plain +.endfor +.endif From owner-svn-src-projects@freebsd.org Wed Feb 20 01:11:32 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9735914E05BC for ; Wed, 20 Feb 2019 01:11:32 +0000 (UTC) (envelope-from ngie@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 370B485200; Wed, 20 Feb 2019 01:11:32 +0000 (UTC) (envelope-from ngie@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 1C44525EB6; Wed, 20 Feb 2019 01:11:32 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K1BV5B030370; Wed, 20 Feb 2019 01:11:31 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K1BVRI030366; Wed, 20 Feb 2019 01:11:31 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200111.x1K1BVRI030366@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 01:11:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344329 - in projects/import-googletest-1.8.1: cddl/usr.sbin/zfsd/tests lib/googletest/gmock/tests lib/googletest/gmock_main/tests lib/googletest/gtest/tests lib/googletest/gtest_main/t... X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1: cddl/usr.sbin/zfsd/tests lib/googletest/gmock/tests lib/googletest/gmock_main/tests lib/googletest/gtest/tests lib/googletest/gtest_main/tests X-SVN-Commit-Revision: 344329 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 370B485200 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.980,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 01:11:32 -0000 Author: ngie Date: Wed Feb 20 01:11:30 2019 New Revision: 344329 URL: https://svnweb.freebsd.org/changeset/base/344329 Log: Use `GTESTS` instead of `PLAIN_TESTS_CXX` The former is from googletest.test.mk, whereas the latter is from plain.test.mk. As noted in r344328, Kyua will adopt more native GoogleTest support. Thus, it's more desirable to make the test interface more of an opaque blackbox for the testcase implementer. Modified: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/tests/Makefile projects/import-googletest-1.8.1/lib/googletest/gmock/tests/Makefile projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Modified: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/tests/Makefile Wed Feb 20 01:09:03 2019 (r344328) +++ projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/tests/Makefile Wed Feb 20 01:11:30 2019 (r344329) @@ -3,13 +3,10 @@ .include "${.CURDIR}/../Makefile.common" .PATH: ${.CURDIR:H} -PLAIN_TESTS_CXX= zfsd_unittest -SRCS.zfsd_unittest:= ${SRCS:Nzfsd_main.cc} -SRCS.zfsd_unittest+= libmocks.c zfsd_unittest.cc -SRCS= +GTESTS= zfsd_unittest -# Use #include in test programs. -INCFLAGS+= -I${.CURDIR:H:H} +SRCS.zfsd_unittest:= ${SRCS:Nzfsd_main.cc} +SRCS.zfsd_unittest+= libmocks.c zfsd_unittest.cc LIBDADD.zfsd_unittest+= gmock_main Modified: projects/import-googletest-1.8.1/lib/googletest/gmock/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gmock/tests/Makefile Wed Feb 20 01:09:03 2019 (r344328) +++ projects/import-googletest-1.8.1/lib/googletest/gmock/tests/Makefile Wed Feb 20 01:11:30 2019 (r344329) @@ -1,8 +1,8 @@ # $FreeBSD$ -PLAIN_TESTS_CXX+= gmock_stress_test +GTESTS+= gmock_stress_test -LIBADD+= gmock +LIBADD+= gmock # XXX: https://github.com/google/googletest/pull/2119 NO_WERROR= Modified: projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile Wed Feb 20 01:09:03 2019 (r344328) +++ projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile Wed Feb 20 01:11:30 2019 (r344329) @@ -4,27 +4,27 @@ .PATH: ${GOOGLEMOCK_SRCROOT}/src ${GOOGLEMOCK_SRCROOT}/test -PLAIN_TESTS_CXX+= gmock-actions_test -PLAIN_TESTS_CXX+= gmock-cardinalities_test -PLAIN_TESTS_CXX+= gmock-ex_test -PLAIN_TESTS_CXX+= gmock-generated-actions_test -PLAIN_TESTS_CXX+= gmock-generated-function-mockers_test -PLAIN_TESTS_CXX+= gmock-generated-internal-utils_test -PLAIN_TESTS_CXX+= gmock-generated-matchers_test -PLAIN_TESTS_CXX+= gmock-internal-utils_test -PLAIN_TESTS_CXX+= gmock-matchers_test -PLAIN_TESTS_CXX+= gmock-more-actions_test -PLAIN_TESTS_CXX+= gmock-nice-strict_test -PLAIN_TESTS_CXX+= gmock-port_test -PLAIN_TESTS_CXX+= gmock-spec-builders_test -PLAIN_TESTS_CXX+= gmock_link_test -PLAIN_TESTS_CXX+= gmock_test +GTESTS+= gmock-actions_test +GTESTS+= gmock-cardinalities_test +GTESTS+= gmock-ex_test +GTESTS+= gmock-generated-actions_test +GTESTS+= gmock-generated-function-mockers_test +GTESTS+= gmock-generated-internal-utils_test +GTESTS+= gmock-generated-matchers_test +GTESTS+= gmock-internal-utils_test +GTESTS+= gmock-matchers_test +GTESTS+= gmock-more-actions_test +GTESTS+= gmock-nice-strict_test +GTESTS+= gmock-port_test +GTESTS+= gmock-spec-builders_test +GTESTS+= gmock_link_test +GTESTS+= gmock_test -CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT}/include -CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT} +CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT}/include +CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT} -.for test in ${PLAIN_TESTS_CXX} -SRCS.${test}= gmock_main.cc +.for test in ${GTESTS} +SRCS.${test}= gmock_main.cc .endfor SRCS.gmock_link_test+= gmock_link2_test.cc Modified: projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile Wed Feb 20 01:09:03 2019 (r344328) +++ projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile Wed Feb 20 01:11:30 2019 (r344329) @@ -4,27 +4,27 @@ .PATH: ${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test -PLAIN_TESTS_CXX+= gtest_environment_test -PLAIN_TESTS_CXX+= gtest_no_test_unittest -PLAIN_TESTS_CXX+= googletest-param-test-test -PLAIN_TESTS_CXX+= gtest_premature_exit_test -PLAIN_TESTS_CXX+= gtest_repeat_test -PLAIN_TESTS_CXX+= gtest_stress_test -PLAIN_TESTS_CXX+= gtest_throw_on_failure_ex_test -PLAIN_TESTS_CXX+= gtest-unittest-api_test +GTESTS+= gtest_environment_test +GTESTS+= gtest_no_test_unittest +GTESTS+= googletest-param-test-test +GTESTS+= gtest_premature_exit_test +GTESTS+= gtest_repeat_test +GTESTS+= gtest_stress_test +GTESTS+= gtest_throw_on_failure_ex_test +GTESTS+= gtest-unittest-api_test SRCS.googletest-param-test-test+= googletest-param-test-test.cc SRCS.googletest-param-test-test+= googletest-param-test2-test.cc SRCS.gtest_premature_exit_test+= gtest_premature_exit_test.cc -.for test in ${PLAIN_TESTS_CXX} +.for test in ${GTESTS} # XXX: linker error; no main(..) -#SRCS.${test}= gtest-all.cc -SRCS.${test}?= gtest_main.cc +#SRCS.${test}= gtest-all.cc +SRCS.${test}?= gtest_main.cc .endfor -CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include -CXXFLAGS+= -I${GOOGLETEST_SRCROOT} +CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include +CXXFLAGS+= -I${GOOGLETEST_SRCROOT} LIBADD= gtest Modified: projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Wed Feb 20 01:09:03 2019 (r344328) +++ projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Wed Feb 20 01:11:30 2019 (r344329) @@ -4,28 +4,28 @@ .PATH: ${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test -PLAIN_TESTS_CXX+= googletest-death-test-test -PLAIN_TESTS_CXX+= googletest-filepath-test -PLAIN_TESTS_CXX+= googletest-linked-ptr-test -PLAIN_TESTS_CXX+= googletest-listener-test -PLAIN_TESTS_CXX+= gtest_main_unittest -PLAIN_TESTS_CXX+= googletest-message-test -PLAIN_TESTS_CXX+= googletest-options-test -PLAIN_TESTS_CXX+= googletest-port-test -PLAIN_TESTS_CXX+= gtest_pred_impl_unittest -PLAIN_TESTS_CXX+= googletest-printers-test -PLAIN_TESTS_CXX+= gtest_prod_test -PLAIN_TESTS_CXX+= gtest_sole_header_test -PLAIN_TESTS_CXX+= googletest-test-part-test -PLAIN_TESTS_CXX+= gtest-typed-test_test -PLAIN_TESTS_CXX+= gtest_unittest +GTESTS+= googletest-death-test-test +GTESTS+= googletest-filepath-test +GTESTS+= googletest-linked-ptr-test +GTESTS+= googletest-listener-test +GTESTS+= gtest_main_unittest +GTESTS+= googletest-message-test +GTESTS+= googletest-options-test +GTESTS+= googletest-port-test +GTESTS+= gtest_pred_impl_unittest +GTESTS+= googletest-printers-test +GTESTS+= gtest_prod_test +GTESTS+= gtest_sole_header_test +GTESTS+= googletest-test-part-test +GTESTS+= gtest-typed-test_test +GTESTS+= gtest_unittest -.for test in ${PLAIN_TESTS_CXX} -SRCS.${test}= gtest_main.cc +.for test in ${GTESTS} +SRCS.${test}= gtest_main.cc .endfor -CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include -CXXFLAGS+= -I${GOOGLETEST_SRCROOT} +CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include +CXXFLAGS+= -I${GOOGLETEST_SRCROOT} SRCS.gtest-typed-test_test+= gtest-typed-test2_test.cc From owner-svn-src-projects@freebsd.org Wed Feb 20 01:13:00 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C952514E05EC for ; Wed, 20 Feb 2019 01:13:00 +0000 (UTC) (envelope-from ngie@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 64B4A854C1; Wed, 20 Feb 2019 01:13:00 +0000 (UTC) (envelope-from ngie@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 528E526007; Wed, 20 Feb 2019 01:13:00 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K1D0X3032946; Wed, 20 Feb 2019 01:13:00 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K1D0Yb032945; Wed, 20 Feb 2019 01:13:00 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200113.x1K1D0Yb032945@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 01:13:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344330 - projects/import-googletest-1.8.1/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/share/mk X-SVN-Commit-Revision: 344330 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 64B4A854C1 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.979,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 01:13:01 -0000 Author: ngie Date: Wed Feb 20 01:12:59 2019 New Revision: 344330 URL: https://svnweb.freebsd.org/changeset/base/344330 Log: Document `GTESTS` variable in googletest.test.mk Modified: projects/import-googletest-1.8.1/share/mk/bsd.README Modified: projects/import-googletest-1.8.1/share/mk/bsd.README ============================================================================== --- projects/import-googletest-1.8.1/share/mk/bsd.README Wed Feb 20 01:11:30 2019 (r344329) +++ projects/import-googletest-1.8.1/share/mk/bsd.README Wed Feb 20 01:12:59 2019 (r344330) @@ -649,6 +649,8 @@ ATF_TESTS_CXX The names of the ATF C++ test programs t ATF_TESTS_SH The names of the ATF sh test programs to build. +GTESTS The names of the GoogleTest test programs to build. + KYUAFILE If 'auto' (the default), generate a Kyuafile out of the test programs defined in the Makefile. If 'yes', then a manually-crafted Kyuafile must be supplied with the From owner-svn-src-projects@freebsd.org Wed Feb 20 03:07:12 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83E8614E3650 for ; Wed, 20 Feb 2019 03:07:12 +0000 (UTC) (envelope-from ngie@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 2420189221; Wed, 20 Feb 2019 03:07:12 +0000 (UTC) (envelope-from ngie@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 13ED9273C6; Wed, 20 Feb 2019 03:07:12 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K37BjM091086; Wed, 20 Feb 2019 03:07:11 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K37Bur091084; Wed, 20 Feb 2019 03:07:11 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200307.x1K37Bur091084@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 03:07:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344336 - in projects/import-googletest-1.8.1/lib/googletest: . tests X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1/lib/googletest: . tests X-SVN-Commit-Revision: 344336 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2420189221 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.979,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 03:07:12 -0000 Author: ngie Date: Wed Feb 20 03:07:11 2019 New Revision: 344336 URL: https://svnweb.freebsd.org/changeset/base/344336 Log: Add glue Makefile for tests under lib/googletest/... Added: projects/import-googletest-1.8.1/lib/googletest/tests/ projects/import-googletest-1.8.1/lib/googletest/tests/Makefile (contents, props changed) Modified: projects/import-googletest-1.8.1/lib/googletest/Makefile Modified: projects/import-googletest-1.8.1/lib/googletest/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/Makefile Wed Feb 20 03:00:55 2019 (r344335) +++ projects/import-googletest-1.8.1/lib/googletest/Makefile Wed Feb 20 03:07:11 2019 (r344336) @@ -1,10 +1,14 @@ # $FreeBSD$ -SUBDIR+= gtest -SUBDIR+= .WAIT -SUBDIR+= gmock -SUBDIR+= .WAIT -SUBDIR+= gmock_main -SUBDIR+= gtest_main +.include + +SUBDIR+= gtest +SUBDIR+= .WAIT +SUBDIR+= gmock +SUBDIR+= .WAIT +SUBDIR+= gmock_main +SUBDIR+= gtest_main + +SUBDIR.${MK_TESTS}+= tests .include Added: projects/import-googletest-1.8.1/lib/googletest/tests/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/import-googletest-1.8.1/lib/googletest/tests/Makefile Wed Feb 20 03:07:11 2019 (r344336) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +.PATH: ${SRCTOP}/tests +KYUAFILE= yes + +.include From owner-svn-src-projects@freebsd.org Wed Feb 20 05:56:08 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A71AD14E6DB2 for ; Wed, 20 Feb 2019 05:56:08 +0000 (UTC) (envelope-from ngie@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 40B5C8D9B9; Wed, 20 Feb 2019 05:56:08 +0000 (UTC) (envelope-from ngie@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 330531135; Wed, 20 Feb 2019 05:56:08 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K5u8iR078831; Wed, 20 Feb 2019 05:56:08 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K5u8hu078830; Wed, 20 Feb 2019 05:56:08 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200556.x1K5u8hu078830@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 05:56:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344338 - projects/import-googletest-1.8.1/etc/mtree X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/etc/mtree X-SVN-Commit-Revision: 344338 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 40B5C8D9B9 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 05:56:08 -0000 Author: ngie Date: Wed Feb 20 05:56:07 2019 New Revision: 344338 URL: https://svnweb.freebsd.org/changeset/base/344338 Log: Add entries in BSD.tests.dist for the googletest test dirs Modified: projects/import-googletest-1.8.1/etc/mtree/BSD.tests.dist Modified: projects/import-googletest-1.8.1/etc/mtree/BSD.tests.dist ============================================================================== --- projects/import-googletest-1.8.1/etc/mtree/BSD.tests.dist Wed Feb 20 05:19:16 2019 (r344337) +++ projects/import-googletest-1.8.1/etc/mtree/BSD.tests.dist Wed Feb 20 05:56:07 2019 (r344338) @@ -278,6 +278,16 @@ static .. .. + googletest + gmock + .. + gmock_main + .. + gtest + .. + gtest_main + .. + .. libarchive .. libc From owner-svn-src-projects@freebsd.org Wed Feb 20 06:03:23 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D162914E721C for ; Wed, 20 Feb 2019 06:03:22 +0000 (UTC) (envelope-from ngie@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 65F5A8DEEE; Wed, 20 Feb 2019 06:03:22 +0000 (UTC) (envelope-from ngie@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 423E112F3; Wed, 20 Feb 2019 06:03:22 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K63MwX083933; Wed, 20 Feb 2019 06:03:22 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K63LnV083929; Wed, 20 Feb 2019 06:03:21 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200603.x1K63LnV083929@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 06:03:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344339 - in projects/import-googletest-1.8.1: cddl/usr.sbin/zfsd lib/googletest/gmock lib/googletest/gmock_main lib/googletest/gtest lib/googletest/gtest_main X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1: cddl/usr.sbin/zfsd lib/googletest/gmock lib/googletest/gmock_main lib/googletest/gtest lib/googletest/gtest_main X-SVN-Commit-Revision: 344339 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 65F5A8DEEE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 06:03:23 -0000 Author: ngie Date: Wed Feb 20 06:03:21 2019 New Revision: 344339 URL: https://svnweb.freebsd.org/changeset/base/344339 Log: Sprinkle `${HAS_TESTS}` in Makefiles While here, reindent `SUBDIR.${MK_TESTS}` Modified: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile Modified: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile ============================================================================== --- projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile Wed Feb 20 05:56:07 2019 (r344338) +++ projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile Wed Feb 20 06:03:21 2019 (r344339) @@ -7,6 +7,7 @@ PROG_CXX= zfsd MAN= zfsd.8 -SUBDIR.${MK_GOOGLETEST}+= tests +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests .include Modified: projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile Wed Feb 20 05:56:07 2019 (r344338) +++ projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile Wed Feb 20 06:03:21 2019 (r344339) @@ -42,4 +42,7 @@ INTERNAL_CUSTOM_INCS+= gmock/internal/custom/gmock-gen SRCS+= gmock-all.cc +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include Modified: projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile Wed Feb 20 05:56:07 2019 (r344338) +++ projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile Wed Feb 20 06:03:21 2019 (r344339) @@ -19,6 +19,7 @@ LDFLAGS+= -L${LIBGMOCKDIR} SRCS+= gmock_main.cc -SUBDIR.${MK_TESTS}+= tests +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests .include Modified: projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile Wed Feb 20 05:56:07 2019 (r344338) +++ projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile Wed Feb 20 06:03:21 2019 (r344339) @@ -47,6 +47,7 @@ SRCS+= gtest-all.cc LIBADD+= pthread -SUBDIR.${MK_TESTS}+= tests +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests .include Modified: projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile Wed Feb 20 05:56:07 2019 (r344338) +++ projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile Wed Feb 20 06:03:21 2019 (r344339) @@ -17,6 +17,7 @@ LDFLAGS+= -L${LIBGTESTDIR} SRCS+= gtest_main.cc -SUBDIR.${MK_TESTS}+= tests +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests .include From owner-svn-src-projects@freebsd.org Wed Feb 20 06:52:59 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8F35114E82E6 for ; Wed, 20 Feb 2019 06:52:59 +0000 (UTC) (envelope-from ngie@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 321B98FCDC; Wed, 20 Feb 2019 06:52:59 +0000 (UTC) (envelope-from ngie@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 907671B5E; Wed, 20 Feb 2019 06:52:56 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K6qupW010232; Wed, 20 Feb 2019 06:52:56 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K6quhw010230; Wed, 20 Feb 2019 06:52:56 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200652.x1K6quhw010230@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 06:52:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344341 - projects/import-googletest-1.8.1/etc/mtree X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/etc/mtree X-SVN-Commit-Revision: 344341 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 321B98FCDC X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.971,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 06:52:59 -0000 Author: ngie Date: Wed Feb 20 06:52:55 2019 New Revision: 344341 URL: https://svnweb.freebsd.org/changeset/base/344341 Log: Fix the pathing for the header files It needs to be prefixed under /usr/include/private; not /usr/include Modified: projects/import-googletest-1.8.1/etc/mtree/BSD.include.dist projects/import-googletest-1.8.1/etc/mtree/BSD.usr.dist Modified: projects/import-googletest-1.8.1/etc/mtree/BSD.include.dist ============================================================================== --- projects/import-googletest-1.8.1/etc/mtree/BSD.include.dist Wed Feb 20 06:40:52 2019 (r344340) +++ projects/import-googletest-1.8.1/etc/mtree/BSD.include.dist Wed Feb 20 06:52:55 2019 (r344341) @@ -231,18 +231,6 @@ virstor .. .. - gmock - internal - custom - .. - .. - .. - gtest - internal - custom - .. - .. - .. gnu posix .. Modified: projects/import-googletest-1.8.1/etc/mtree/BSD.usr.dist ============================================================================== --- projects/import-googletest-1.8.1/etc/mtree/BSD.usr.dist Wed Feb 20 06:40:52 2019 (r344340) +++ projects/import-googletest-1.8.1/etc/mtree/BSD.usr.dist Wed Feb 20 06:52:55 2019 (r344341) @@ -13,6 +13,18 @@ .. event .. + gmock + internal + custom + .. + .. + .. + gtest + internal + custom + .. + .. + .. sqlite3 .. ucl From owner-svn-src-projects@freebsd.org Wed Feb 20 06:54:33 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2507314E8343 for ; Wed, 20 Feb 2019 06:54:33 +0000 (UTC) (envelope-from ngie@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 BC1F68FE5D; Wed, 20 Feb 2019 06:54:32 +0000 (UTC) (envelope-from ngie@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 AA6A91B5F; Wed, 20 Feb 2019 06:54:32 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K6sWjG010338; Wed, 20 Feb 2019 06:54:32 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K6sW7a010337; Wed, 20 Feb 2019 06:54:32 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200654.x1K6sW7a010337@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 06:54:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344342 - projects/import-googletest-1.8.1/lib/googletest X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/lib/googletest X-SVN-Commit-Revision: 344342 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BC1F68FE5D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.971,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 06:54:33 -0000 Author: ngie Date: Wed Feb 20 06:54:32 2019 New Revision: 344342 URL: https://svnweb.freebsd.org/changeset/base/344342 Log: Add more port-related flags to Makefile.inc Modified: projects/import-googletest-1.8.1/lib/googletest/Makefile.inc Modified: projects/import-googletest-1.8.1/lib/googletest/Makefile.inc ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/Makefile.inc Wed Feb 20 06:52:55 2019 (r344341) +++ projects/import-googletest-1.8.1/lib/googletest/Makefile.inc Wed Feb 20 06:54:32 2019 (r344342) @@ -1,6 +1,8 @@ # $FreeBSD$ +CXXFLAGS+= -DGTEST_HAS_POSIX_RE=1 CXXFLAGS+= -DGTEST_HAS_PTHREAD=1 +CXXFLAGS+= -DGTEST_HAS_STREAM_REDIRECTION=1 GTEST_DIR= ${SRCTOP}/contrib/googletest GOOGLEMOCK_SRCROOT= ${GTEST_DIR}/googlemock From owner-svn-src-projects@freebsd.org Wed Feb 20 07:21:23 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 92BD914E908F for ; Wed, 20 Feb 2019 07:21:23 +0000 (UTC) (envelope-from ngie@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 2EBA26A7C0; Wed, 20 Feb 2019 07:21:23 +0000 (UTC) (envelope-from ngie@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 793ED1F04; Wed, 20 Feb 2019 07:21:22 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K7LMn5025105; Wed, 20 Feb 2019 07:21:22 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K7LMd0025104; Wed, 20 Feb 2019 07:21:22 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200721.x1K7LMd0025104@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 07:21:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344344 - projects/import-googletest-1.8.1/contrib/googletest/googletest/test X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/contrib/googletest/googletest/test X-SVN-Commit-Revision: 344344 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2EBA26A7C0 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 07:21:23 -0000 Author: ngie Date: Wed Feb 20 07:21:22 2019 New Revision: 344344 URL: https://svnweb.freebsd.org/changeset/base/344344 Log: Don't hardcode the source filename In order to compile these tests with different CXXFLAGS, I needed to copy them to different filenames to trick the compiler. Unfortunately, this triggers a failure with one of the tests as it hardcodes the path to the test, instead of relying on the compiler to fill in the path via `__FILE__`. Using `__FILE__` is standard and works. Rely on it instead of a hardcoded path. Modified: projects/import-googletest-1.8.1/contrib/googletest/googletest/test/googletest-death-test_ex_test.cc Modified: projects/import-googletest-1.8.1/contrib/googletest/googletest/test/googletest-death-test_ex_test.cc ============================================================================== --- projects/import-googletest-1.8.1/contrib/googletest/googletest/test/googletest-death-test_ex_test.cc Wed Feb 20 07:10:38 2019 (r344343) +++ projects/import-googletest-1.8.1/contrib/googletest/googletest/test/googletest-death-test_ex_test.cc Wed Feb 20 07:21:22 2019 (r344344) @@ -68,7 +68,7 @@ TEST(CxxExceptionDeathTest, PrintsMessageForStdExcepti "exceptional message"); // Verifies that the location is mentioned in the failure text. EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(throw TestException(), ""), - "googletest-death-test_ex_test.cc"); + __FILE__); } # endif // GTEST_HAS_EXCEPTIONS From owner-svn-src-projects@freebsd.org Wed Feb 20 07:29:51 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33AB614E92C9 for ; Wed, 20 Feb 2019 07:29:51 +0000 (UTC) (envelope-from ngie@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 CC08E6AB31; Wed, 20 Feb 2019 07:29:50 +0000 (UTC) (envelope-from ngie@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 B3365205F; Wed, 20 Feb 2019 07:29:50 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K7TotB026199; Wed, 20 Feb 2019 07:29:50 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K7ToXS026198; Wed, 20 Feb 2019 07:29:50 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200729.x1K7ToXS026198@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 07:29:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344345 - projects/import-googletest-1.8.1/lib/googletest/gtest/tests X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/lib/googletest/gtest/tests X-SVN-Commit-Revision: 344345 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CC08E6AB31 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 07:29:51 -0000 Author: ngie Date: Wed Feb 20 07:29:50 2019 New Revision: 344345 URL: https://svnweb.freebsd.org/changeset/base/344345 Log: Fix gtest test compilation and build more tests My previous work to integrate these tests was incomplete/incorrect, because I misunderstood how the cmake macros worked. This addresses items with the gtest tests, which in turn fixes test compilation and adds more tests which I had previously missed. Due to an unknown issue with gtest_stress_test, I had to add pthread to LIBADD, even though I shouldn't have added it to that (it was failing to link -lpthread to libprivategtest.a). Add a XXX comment to note that something's awry there and deserves additional investigation. Modified: projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile Modified: projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile Wed Feb 20 07:21:22 2019 (r344344) +++ projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile Wed Feb 20 07:29:50 2019 (r344345) @@ -4,6 +4,8 @@ .PATH: ${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test +GTESTS+= gtest-death-test_ex_catch_test +GTESTS+= gtest-death-test_ex_nocatch_test GTESTS+= gtest_environment_test GTESTS+= gtest_no_test_unittest GTESTS+= googletest-param-test-test @@ -13,20 +15,29 @@ GTESTS+= gtest_stress_test GTESTS+= gtest_throw_on_failure_ex_test GTESTS+= gtest-unittest-api_test -SRCS.googletest-param-test-test+= googletest-param-test-test.cc -SRCS.googletest-param-test-test+= googletest-param-test2-test.cc -SRCS.gtest_premature_exit_test+= gtest_premature_exit_test.cc - -.for test in ${GTESTS} -# XXX: linker error; no main(..) -#SRCS.${test}= gtest-all.cc -SRCS.${test}?= gtest_main.cc -.endfor - CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include CXXFLAGS+= -I${GOOGLETEST_SRCROOT} -LIBADD= gtest +gtest-death-test_ex_catch_test.cc gtest-death-test_ex_nocatch_test.cc: googletest-death-test_ex_test.cc + ${CP} ${.ALLSRC} ${.TARGET} + +CXXFLAGS.gtest-death-test_ex_catch_test+= \ + -DGTEST_ENABLE_CATCH_EXCEPTIONS_=1 \ + -fexceptions + +CXXFLAGS.gtest-death-test_ex_nocatch_test+= \ + -DGTEST_ENABLE_CATCH_EXCEPTIONS_=0 \ + -fexceptions + +SRCS.googletest-param-test-test= \ + googletest-param-test-test.cc \ + googletest-param-test2-test.cc + +LIBADD+= gtest + +# XXX: explicitly listing -lpthread is incorrect. src.libnames.mk should be +# handling this. +LIBADD.gtest_stress_test+= pthread # XXX: https://github.com/google/googletest/pull/2119 NO_WERROR= From owner-svn-src-projects@freebsd.org Wed Feb 20 07:49:10 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 64CAB14E9968 for ; Wed, 20 Feb 2019 07:49:10 +0000 (UTC) (envelope-from ngie@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 0B84D6B85D; Wed, 20 Feb 2019 07:49:10 +0000 (UTC) (envelope-from ngie@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 F2DB923D1; Wed, 20 Feb 2019 07:49:09 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K7n9s3036953; Wed, 20 Feb 2019 07:49:09 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K7n9xb036952; Wed, 20 Feb 2019 07:49:09 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200749.x1K7n9xb036952@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 07:49:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344346 - projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests X-SVN-Commit-Revision: 344346 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0B84D6B85D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 07:49:10 -0000 Author: ngie Date: Wed Feb 20 07:49:09 2019 New Revision: 344346 URL: https://svnweb.freebsd.org/changeset/base/344346 Log: Apply lessons learned in r344345 on gtest_main tests The key difference is that some of the programs were previously being compiled and installed as tests, which is incorrect. Treat them like helpers instead. Modified: projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Modified: projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Wed Feb 20 07:29:50 2019 (r344345) +++ projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Wed Feb 20 07:49:09 2019 (r344346) @@ -20,15 +20,30 @@ GTESTS+= googletest-test-part-test GTESTS+= gtest-typed-test_test GTESTS+= gtest_unittest -.for test in ${GTESTS} -SRCS.${test}= gtest_main.cc -.endfor - CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include CXXFLAGS+= -I${GOOGLETEST_SRCROOT} -SRCS.gtest-typed-test_test+= gtest-typed-test2_test.cc +HELPERS+= gtest_help_test_ +HELPERS+= gtest_xml_outfile1_test_ +HELPERS+= gtest_xml_outfile2_test_ -LIBADD= gtest +BINDIR= ${TESTSDIR} +PROGS_CXX+= ${HELPERS} + +SRCS.gtest-typed-test_test= \ + gtest-typed-test_test.cc \ + gtest-typed-test2_test.cc + +SRCS.gtest_prod_test= \ + gtest_prod_test.cc \ + production.cc + +LIBADD+= gtest gtest_main + +LIBADD.googletest-port-test+= pthread +LIBADD.gtest_unittest+= pthread + +# XXX: https://github.com/google/googletest/pull/2119 +NO_WERROR= .include From owner-svn-src-projects@freebsd.org Wed Feb 20 07:52:56 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9DA9A14E9BCC for ; Wed, 20 Feb 2019 07:52:56 +0000 (UTC) (envelope-from ngie@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 40CA26BC6B; Wed, 20 Feb 2019 07:52:56 +0000 (UTC) (envelope-from ngie@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 2D8592573; Wed, 20 Feb 2019 07:52:56 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K7quOQ041874; Wed, 20 Feb 2019 07:52:56 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K7quJO041873; Wed, 20 Feb 2019 07:52:56 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200752.x1K7quJO041873@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 07:52:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344347 - projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests X-SVN-Commit-Revision: 344347 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 40CA26BC6B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 07:52:56 -0000 Author: ngie Date: Wed Feb 20 07:52:55 2019 New Revision: 344347 URL: https://svnweb.freebsd.org/changeset/base/344347 Log: Oh wait... those helper programs were for the py tests We don't need to install those. Leave that testing for the package's tests Modified: projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Modified: projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Wed Feb 20 07:49:09 2019 (r344346) +++ projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Wed Feb 20 07:52:55 2019 (r344347) @@ -23,13 +23,6 @@ GTESTS+= gtest_unittest CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include CXXFLAGS+= -I${GOOGLETEST_SRCROOT} -HELPERS+= gtest_help_test_ -HELPERS+= gtest_xml_outfile1_test_ -HELPERS+= gtest_xml_outfile2_test_ - -BINDIR= ${TESTSDIR} -PROGS_CXX+= ${HELPERS} - SRCS.gtest-typed-test_test= \ gtest-typed-test_test.cc \ gtest-typed-test2_test.cc From owner-svn-src-projects@freebsd.org Wed Feb 20 08:01:01 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6BCDD14EA080 for ; Wed, 20 Feb 2019 08:01:01 +0000 (UTC) (envelope-from ngie@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 105A96C0D5; Wed, 20 Feb 2019 08:01:01 +0000 (UTC) (envelope-from ngie@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 04D3926A9; Wed, 20 Feb 2019 08:01:01 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K810OM042297; Wed, 20 Feb 2019 08:01:00 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K810oX042296; Wed, 20 Feb 2019 08:01:00 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200801.x1K810oX042296@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 08:01:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344348 - projects/import-googletest-1.8.1/lib/googletest/gmock X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/lib/googletest/gmock X-SVN-Commit-Revision: 344348 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 105A96C0D5 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 08:01:01 -0000 Author: ngie Date: Wed Feb 20 08:01:00 2019 New Revision: 344348 URL: https://svnweb.freebsd.org/changeset/base/344348 Log: Add glue Makefile.inc to make the next hop to the googletest/Makefile.inc Added: projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile.inc - copied unchanged from r344270, projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile.inc Copied: projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile.inc (from r344270, projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile.inc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile.inc Wed Feb 20 08:01:00 2019 (r344348, copy of r344270, projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile.inc) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +include ../Makefile.inc From owner-svn-src-projects@freebsd.org Wed Feb 20 08:04:09 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D702D14EA2A3 for ; Wed, 20 Feb 2019 08:04:09 +0000 (UTC) (envelope-from ngie@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 7ABAA6C458; Wed, 20 Feb 2019 08:04:09 +0000 (UTC) (envelope-from ngie@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 4BF35272B; Wed, 20 Feb 2019 08:04:09 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K8498p046939; Wed, 20 Feb 2019 08:04:09 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K849mh046938; Wed, 20 Feb 2019 08:04:09 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200804.x1K849mh046938@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 08:04:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344349 - projects/import-googletest-1.8.1/lib/googletest/gmock/tests X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/lib/googletest/gmock/tests X-SVN-Commit-Revision: 344349 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7ABAA6C458 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 08:04:10 -0000 Author: ngie Date: Wed Feb 20 08:04:08 2019 New Revision: 344349 URL: https://svnweb.freebsd.org/changeset/base/344349 Log: Fix test compilation for gmock tests, similar to r344345 Modified: projects/import-googletest-1.8.1/lib/googletest/gmock/tests/Makefile Modified: projects/import-googletest-1.8.1/lib/googletest/gmock/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gmock/tests/Makefile Wed Feb 20 08:01:00 2019 (r344348) +++ projects/import-googletest-1.8.1/lib/googletest/gmock/tests/Makefile Wed Feb 20 08:04:08 2019 (r344349) @@ -1,8 +1,12 @@ # $FreeBSD$ +.include + +.PATH: ${GOOGLEMOCK_SRCROOT}/src ${GOOGLEMOCK_SRCROOT}/test + GTESTS+= gmock_stress_test -LIBADD+= gmock +LIBADD+= pthread gtest gmock # XXX: https://github.com/google/googletest/pull/2119 NO_WERROR= From owner-svn-src-projects@freebsd.org Wed Feb 20 09:33:56 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6737114EC93B for ; Wed, 20 Feb 2019 09:33:56 +0000 (UTC) (envelope-from ngie@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 0A4D66EFAC; Wed, 20 Feb 2019 09:33:56 +0000 (UTC) (envelope-from ngie@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 EE69F3834; Wed, 20 Feb 2019 09:33:55 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K9XtIF094306; Wed, 20 Feb 2019 09:33:55 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K9XtKk094305; Wed, 20 Feb 2019 09:33:55 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200933.x1K9XtKk094305@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 09:33:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344350 - projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests X-SVN-Commit-Revision: 344350 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0A4D66EFAC X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 09:33:56 -0000 Author: ngie Date: Wed Feb 20 09:33:55 2019 New Revision: 344350 URL: https://svnweb.freebsd.org/changeset/base/344350 Log: Fix test compilation for gmock_main tests, similar to r344345 Modified: projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile Modified: projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile Wed Feb 20 08:04:08 2019 (r344349) +++ projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile Wed Feb 20 09:33:55 2019 (r344350) @@ -6,7 +6,7 @@ GTESTS+= gmock-actions_test GTESTS+= gmock-cardinalities_test -GTESTS+= gmock-ex_test +GTESTS+= gmock_ex_test GTESTS+= gmock-generated-actions_test GTESTS+= gmock-generated-function-mockers_test GTESTS+= gmock-generated-internal-utils_test @@ -22,13 +22,16 @@ GTESTS+= gmock_test CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT}/include CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT} +CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include +CXXFLAGS+= -I${GOOGLETEST_SRCROOT} -.for test in ${GTESTS} -SRCS.${test}= gmock_main.cc -.endfor +SRCS.gmock_link_test= \ + gmock_link_test.cc \ + gmock_link2_test.cc -SRCS.gmock_link_test+= gmock_link2_test.cc +LIBADD= gmock_main gmock gtest -LIBADD= gmock +# XXX: https://github.com/google/googletest/pull/2119 +NO_WERROR= .include From owner-svn-src-projects@freebsd.org Wed Feb 20 20:10:05 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C2EB414DA174 for ; Wed, 20 Feb 2019 20:10:05 +0000 (UTC) (envelope-from ngie@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 4DFC46B239; Wed, 20 Feb 2019 20:10:05 +0000 (UTC) (envelope-from ngie@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 CB525A631; Wed, 20 Feb 2019 20:10:00 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1KKA0G3056406; Wed, 20 Feb 2019 20:10:00 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1KKA0S3056401; Wed, 20 Feb 2019 20:10:00 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902202010.x1KKA0S3056401@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 20:10:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344380 - in projects/import-googletest-1.8.1: lib/googletest share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1: lib/googletest share/mk X-SVN-Commit-Revision: 344380 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4DFC46B239 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.983,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 20:10:06 -0000 Author: ngie Date: Wed Feb 20 20:09:59 2019 New Revision: 344380 URL: https://svnweb.freebsd.org/changeset/base/344380 Log: Correct gmock/gtest expectations w.r.t. C++11/RTTI Long story short, some of the tests were failing because they expected either dynamic_cast or RTTI to be functional and it wasn't. Move all common CXXFLAGS out to googletest.test.inc.mk and reference it from googletest.test.mk and .../googletest/Makefile.inc Added: projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk (contents, props changed) Modified: projects/import-googletest-1.8.1/lib/googletest/Makefile.inc projects/import-googletest-1.8.1/share/mk/Makefile projects/import-googletest-1.8.1/share/mk/googletest.test.mk Modified: projects/import-googletest-1.8.1/lib/googletest/Makefile.inc ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/Makefile.inc Wed Feb 20 19:32:02 2019 (r344379) +++ projects/import-googletest-1.8.1/lib/googletest/Makefile.inc Wed Feb 20 20:09:59 2019 (r344380) @@ -1,12 +1,12 @@ # $FreeBSD$ -CXXFLAGS+= -DGTEST_HAS_POSIX_RE=1 -CXXFLAGS+= -DGTEST_HAS_PTHREAD=1 -CXXFLAGS+= -DGTEST_HAS_STREAM_REDIRECTION=1 +.include GTEST_DIR= ${SRCTOP}/contrib/googletest -GOOGLEMOCK_SRCROOT= ${GTEST_DIR}/googlemock -GOOGLETEST_SRCROOT= ${GTEST_DIR}/googletest +GOOGLEMOCK_SRCROOT= ${GTEST_DIR}/googlemock +GOOGLETEST_SRCROOT= ${GTEST_DIR}/googletest + +CXXFLAGS+= ${GTESTS_FLAGS} NO_WTHREAD_SAFETY= Modified: projects/import-googletest-1.8.1/share/mk/Makefile ============================================================================== --- projects/import-googletest-1.8.1/share/mk/Makefile Wed Feb 20 19:32:02 2019 (r344379) +++ projects/import-googletest-1.8.1/share/mk/Makefile Wed Feb 20 20:09:59 2019 (r344380) @@ -73,6 +73,7 @@ FILESDIR= ${BINDIR}/mk .if ${MK_TESTS} != "no" FILES+= atf.test.mk +FILES+= googletest.test.inc.mk FILES+= googletest.test.mk FILES+= plain.test.mk FILES+= suite.test.mk Added: projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Wed Feb 20 20:09:59 2019 (r344380) @@ -0,0 +1,9 @@ +# $FreeBSD$ + +GTESTS_CXXFLAGS+= -DGTESTS_HAS_RTTI=1 +GTESTS_CXXFLAGS+= -DGTESTS_HAS_POSIX_RE=1 +GTESTS_CXXFLAGS+= -DGTESTS_HAS_PTHREAD=1 +GTESTS_CXXFLAGS+= -DGTESTS_HAS_STREAM_REDIRECTION=1 +GTESTS_CXXFLAGS+= -DGTESTS_LANG_CXX11=1 +GTESTS_CXXFLAGS+= -frtti +GTESTS_CXXFLAGS+= -std=c++11 Modified: projects/import-googletest-1.8.1/share/mk/googletest.test.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/googletest.test.mk Wed Feb 20 19:32:02 2019 (r344379) +++ projects/import-googletest-1.8.1/share/mk/googletest.test.mk Wed Feb 20 20:09:59 2019 (r344380) @@ -27,10 +27,13 @@ GTESTS?= .if !empty(GTESTS) +.include + PROGS_CXX+= ${GTESTS} _TESTS+= ${GTESTS} .for _T in ${GTESTS} BINDIR.${_T}= ${TESTSDIR} +CXXFLAGS.${_T}+= ${GTESTS_CXXFLAGS} MAN.${_T}?= # empty SRCS.${_T}?= ${_T}.cc TEST_INTERFACE.${_T}= plain From owner-svn-src-projects@freebsd.org Thu Feb 21 03:37:32 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D3F0F14ED9A4 for ; Thu, 21 Feb 2019 03:37:31 +0000 (UTC) (envelope-from ngie@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 7B56488554; Thu, 21 Feb 2019 03:37:31 +0000 (UTC) (envelope-from ngie@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 68957FB62; Thu, 21 Feb 2019 03:37:31 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1L3bVlR013545; Thu, 21 Feb 2019 03:37:31 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1L3bV9x013544; Thu, 21 Feb 2019 03:37:31 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902210337.x1L3bV9x013544@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Thu, 21 Feb 2019 03:37:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344416 - projects/import-googletest-1.8.1/lib/googletest/gtest/tests X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/lib/googletest/gtest/tests X-SVN-Commit-Revision: 344416 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7B56488554 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.964,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Feb 2019 03:37:32 -0000 Author: ngie Date: Thu Feb 21 03:37:31 2019 New Revision: 344416 URL: https://svnweb.freebsd.org/changeset/base/344416 Log: Build death tests programmatically The previous code hardcoded the death test build definitions in a duplicative manner. The new code doesn't. Modified: projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile Modified: projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile Thu Feb 21 03:36:09 2019 (r344415) +++ projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile Thu Feb 21 03:37:31 2019 (r344416) @@ -4,8 +4,6 @@ .PATH: ${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test -GTESTS+= gtest-death-test_ex_catch_test -GTESTS+= gtest-death-test_ex_nocatch_test GTESTS+= gtest_environment_test GTESTS+= gtest_no_test_unittest GTESTS+= googletest-param-test-test @@ -18,16 +16,19 @@ GTESTS+= gtest-unittest-api_test CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include CXXFLAGS+= -I${GOOGLETEST_SRCROOT} -gtest-death-test_ex_catch_test.cc gtest-death-test_ex_nocatch_test.cc: googletest-death-test_ex_test.cc +.for death_test in gtest-death-test_ex_catch_test gtest-death-test_ex_nocatch_test +# XXX: copying source files in order to tweak CXXFLAGS seems hacky. +${death_test}.cc: googletest-death-test_ex_test.cc ${CP} ${.ALLSRC} ${.TARGET} +CLEANFILES+= ${death_test}.cc +CXXFLAGS.${death_test}+= -fexception +.endfor -CXXFLAGS.gtest-death-test_ex_catch_test+= \ - -DGTEST_ENABLE_CATCH_EXCEPTIONS_=1 \ - -fexceptions +CXXFLAGS.gtest-death-test_ex_catch_test+= \ + -DGTEST_ENABLE_CATCH_EXCEPTIONS_=1 CXXFLAGS.gtest-death-test_ex_nocatch_test+= \ - -DGTEST_ENABLE_CATCH_EXCEPTIONS_=0 \ - -fexceptions + -DGTEST_ENABLE_CATCH_EXCEPTIONS_=0 SRCS.googletest-param-test-test= \ googletest-param-test-test.cc \ From owner-svn-src-projects@freebsd.org Thu Feb 21 04:47:46 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0FC2814F2421 for ; Thu, 21 Feb 2019 04:47:46 +0000 (UTC) (envelope-from ngie@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 A7F5C8BE93; Thu, 21 Feb 2019 04:47:45 +0000 (UTC) (envelope-from ngie@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 6D70018814; Thu, 21 Feb 2019 04:47:45 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1L4ljk0050380; Thu, 21 Feb 2019 04:47:45 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1L4liIo050377; Thu, 21 Feb 2019 04:47:44 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902210447.x1L4liIo050377@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Thu, 21 Feb 2019 04:47:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344420 - in projects/import-googletest-1.8.1: lib/googletest/gmock lib/googletest/gtest share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1: lib/googletest/gmock lib/googletest/gtest share/mk X-SVN-Commit-Revision: 344420 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A7F5C8BE93 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.980,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Feb 2019 04:47:46 -0000 Author: ngie Date: Thu Feb 21 04:47:44 2019 New Revision: 344420 URL: https://svnweb.freebsd.org/changeset/base/344420 Log: Use gmock/gtest headers when PRIVATELIB is defined The move to /usr/include/private prefixed paths seems to require a bit more effort in order to compile programs. Install the headers to /usr/include/private/g{mock,test}/... and automatically include /usr/include/private in GTESTS_CXXFLAGS to make compilation seamless. I will work on the more global problem later with @bdrewery. Modified: projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Modified: projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile Thu Feb 21 04:13:20 2019 (r344419) +++ projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile Thu Feb 21 04:47:44 2019 (r344420) @@ -17,7 +17,7 @@ LDFLAGS+= -L${.OBJDIR:H}/gtest INCSGROUPS= MAIN_INCS INTERNAL_INCS INTERNAL_CUSTOM_INCS -MAIN_INCSDIR= ${INCLUDEDIR}/gmock +MAIN_INCSDIR= ${INCLUDEDIR}${PRIVATELIB:D/private/${LIB}} MAIN_INCS+= gmock/gmock-matchers.h MAIN_INCS+= gmock/gmock-more-actions.h MAIN_INCS+= gmock/gmock-generated-actions.h @@ -30,12 +30,12 @@ MAIN_INCS+= gmock/gmock-spec-builders.h MAIN_INCS+= gmock/gmock.h MAIN_INCS+= gmock/gmock-actions.h -INTERNAL_INCSDIR= ${INCLUDEDIR}/gmock/internal +INTERNAL_INCSDIR= ${MAIN_INCSDIR}/internal INTERNAL_INCS+= gmock/internal/gmock-port.h INTERNAL_INCS+= gmock/internal/gmock-internal-utils.h INTERNAL_INCS+= gmock/internal/gmock-generated-internal-utils.h -INTERNAL_CUSTOM_INCSDIR= ${INCLUDEDIR}/gmock/internal/custom +INTERNAL_CUSTOM_INCSDIR= ${INTERNAL_INCSDIR}/custom INTERNAL_CUSTOM_INCS+= gmock/internal/custom/gmock-port.h INTERNAL_CUSTOM_INCS+= gmock/internal/custom/gmock-matchers.h INTERNAL_CUSTOM_INCS+= gmock/internal/custom/gmock-generated-actions.h Modified: projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile Thu Feb 21 04:13:20 2019 (r344419) +++ projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile Thu Feb 21 04:47:44 2019 (r344420) @@ -13,7 +13,7 @@ CXXFLAGS+= -I${GOOGLETEST_SRCROOT} INCSGROUPS= MAIN_INCS INTERNAL_INCS INTERNAL_CUSTOM_INCS -MAIN_INCSDIR= ${INCLUDEDIR}/gtest +MAIN_INCSDIR= ${INCLUDEDIR}${PRIVATELIB:D/private/${LIB}} MAIN_INCS+= gtest/gtest-death-test.h MAIN_INCS+= gtest/gtest-message.h MAIN_INCS+= gtest/gtest-param-test.h @@ -25,7 +25,7 @@ MAIN_INCS+= gtest/gtest.h MAIN_INCS+= gtest/gtest_pred_impl.h MAIN_INCS+= gtest/gtest_prod.h -INTERNAL_INCSDIR= ${INCLUDEDIR}/gtest/internal +INTERNAL_INCSDIR= ${MAIN_INCSDIR}/internal INTERNAL_INCS+= gtest/internal/gtest-death-test-internal.h INTERNAL_INCS+= gtest/internal/gtest-filepath.h INTERNAL_INCS+= gtest/internal/gtest-internal.h @@ -38,7 +38,7 @@ INTERNAL_INCS+= gtest/internal/gtest-string.h INTERNAL_INCS+= gtest/internal/gtest-tuple.h INTERNAL_INCS+= gtest/internal/gtest-type-util.h -INTERNAL_CUSTOM_INCSDIR= ${INCLUDEDIR}/gtest/internal/custom +INTERNAL_CUSTOM_INCSDIR= ${INTERNAL_INCSDIR}/custom INTERNAL_CUSTOM_INCS+= gtest/internal/custom/gtest-port.h INTERNAL_CUSTOM_INCS+= gtest/internal/custom/gtest-printers.h INTERNAL_CUSTOM_INCS+= gtest/internal/custom/gtest.h Modified: projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Thu Feb 21 04:13:20 2019 (r344419) +++ projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Thu Feb 21 04:47:44 2019 (r344420) @@ -7,3 +7,6 @@ GTESTS_CXXFLAGS+= -DGTESTS_HAS_STREAM_REDIRECTION=1 GTESTS_CXXFLAGS+= -DGTESTS_LANG_CXX11=1 GTESTS_CXXFLAGS+= -frtti GTESTS_CXXFLAGS+= -std=c++11 + +# XXX: src.libnames.mk should handle adding this directory. +GTESTS_CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private From owner-svn-src-projects@freebsd.org Thu Feb 21 03:36:10 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8BD4F14ED8EA for ; Thu, 21 Feb 2019 03:36:10 +0000 (UTC) (envelope-from ngie@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 2D4E2883E9; Thu, 21 Feb 2019 03:36:10 +0000 (UTC) (envelope-from ngie@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 1C65DFB5C; Thu, 21 Feb 2019 03:36:10 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1L3a94g013444; Thu, 21 Feb 2019 03:36:09 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1L3a9b1013443; Thu, 21 Feb 2019 03:36:09 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902210336.x1L3a9b1013443@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Thu, 21 Feb 2019 03:36:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344415 - projects/import-googletest-1.8.1/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/share/mk X-SVN-Commit-Revision: 344415 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2D4E2883E9 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.964,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Feb 2019 03:36:10 -0000 Author: ngie Date: Thu Feb 21 03:36:09 2019 New Revision: 344415 URL: https://svnweb.freebsd.org/changeset/base/344415 Log: Fix a typo A previous iteration referenced/used googletest.test.flags.mk, not googletest.test.inc.mk. The latter name is what I settled on as this Makefile snippet can include more logic than flags. Modified: projects/import-googletest-1.8.1/share/mk/googletest.test.mk Modified: projects/import-googletest-1.8.1/share/mk/googletest.test.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/googletest.test.mk Thu Feb 21 03:22:20 2019 (r344414) +++ projects/import-googletest-1.8.1/share/mk/googletest.test.mk Thu Feb 21 03:36:09 2019 (r344415) @@ -27,7 +27,7 @@ GTESTS?= .if !empty(GTESTS) -.include +.include PROGS_CXX+= ${GTESTS} _TESTS+= ${GTESTS} From owner-svn-src-projects@freebsd.org Thu Feb 21 06:49:21 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A630214F95DF for ; Thu, 21 Feb 2019 06:49:21 +0000 (UTC) (envelope-from ngie@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 4C62D91D27; Thu, 21 Feb 2019 06:49:21 +0000 (UTC) (envelope-from ngie@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 39C5519D5D; Thu, 21 Feb 2019 06:49:21 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1L6nLvj013353; Thu, 21 Feb 2019 06:49:21 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1L6nKR9013351; Thu, 21 Feb 2019 06:49:20 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902210649.x1L6nKR9013351@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Thu, 21 Feb 2019 06:49:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344423 - in projects/import-googletest-1.8.1: lib/googletest share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1: lib/googletest share/mk X-SVN-Commit-Revision: 344423 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4C62D91D27 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Feb 2019 06:49:21 -0000 Author: ngie Date: Thu Feb 21 06:49:20 2019 New Revision: 344423 URL: https://svnweb.freebsd.org/changeset/base/344423 Log: Move `NO_WTHREAD_SAFETY` to googletest.test.inc.mk This variable is necessary to compile with googletest at a global level. Move it there. Modified: projects/import-googletest-1.8.1/lib/googletest/Makefile.inc projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Modified: projects/import-googletest-1.8.1/lib/googletest/Makefile.inc ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/Makefile.inc Thu Feb 21 06:40:15 2019 (r344422) +++ projects/import-googletest-1.8.1/lib/googletest/Makefile.inc Thu Feb 21 06:49:20 2019 (r344423) @@ -8,6 +8,4 @@ GOOGLETEST_SRCROOT= ${GTEST_DIR}/googletest CXXFLAGS+= ${GTESTS_FLAGS} -NO_WTHREAD_SAFETY= - WARNS?= 6 Modified: projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Thu Feb 21 06:40:15 2019 (r344422) +++ projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Thu Feb 21 06:49:20 2019 (r344423) @@ -10,3 +10,5 @@ GTESTS_CXXFLAGS+= -std=c++11 # XXX: src.libnames.mk should handle adding this directory. GTESTS_CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private + +NO_WTHREAD_SAFETY= From owner-svn-src-projects@freebsd.org Thu Feb 21 06:23:36 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1843D14F7A3C for ; Thu, 21 Feb 2019 06:23:36 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7BFDC905EB; Thu, 21 Feb 2019 06:23:35 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x1L6NWba018775; Wed, 20 Feb 2019 22:23:32 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id x1L6NWY9018774; Wed, 20 Feb 2019 22:23:32 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201902210623.x1L6NWY9018774@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r344420 - in projects/import-googletest-1.8.1: lib/googletest/gmock lib/googletest/gtest share/mk In-Reply-To: <201902210447.x1L4liIo050377@repo.freebsd.org> To: Enji Cooper Date: Wed, 20 Feb 2019 22:23:32 -0800 (PST) CC: src-committers@freebsd.org, svn-src-projects@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 7BFDC905EB X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.96)[-0.963,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Feb 2019 06:23:36 -0000 > Author: ngie > Date: Thu Feb 21 04:47:44 2019 > New Revision: 344420 > URL: https://svnweb.freebsd.org/changeset/base/344420 > > Log: > Use gmock/gtest headers when PRIVATELIB is defined > > The move to /usr/include/private prefixed paths seems to require a bit more > effort in order to compile programs. > > Install the headers to /usr/include/private/g{mock,test}/... and automatically > include /usr/include/private in GTESTS_CXXFLAGS to make compilation seamless. I > will work on the more global problem later with @bdrewery. Is this also hooked in to a (cd /usr/src/ && make includes) if gtest is enabled? > > Modified: > projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile > projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile > projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk > > Modified: projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile > ============================================================================== > --- projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile Thu Feb 21 04:13:20 2019 (r344419) > +++ projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile Thu Feb 21 04:47:44 2019 (r344420) > @@ -17,7 +17,7 @@ LDFLAGS+= -L${.OBJDIR:H}/gtest > > INCSGROUPS= MAIN_INCS INTERNAL_INCS INTERNAL_CUSTOM_INCS > > -MAIN_INCSDIR= ${INCLUDEDIR}/gmock > +MAIN_INCSDIR= ${INCLUDEDIR}${PRIVATELIB:D/private/${LIB}} > MAIN_INCS+= gmock/gmock-matchers.h > MAIN_INCS+= gmock/gmock-more-actions.h > MAIN_INCS+= gmock/gmock-generated-actions.h > @@ -30,12 +30,12 @@ MAIN_INCS+= gmock/gmock-spec-builders.h > MAIN_INCS+= gmock/gmock.h > MAIN_INCS+= gmock/gmock-actions.h > > -INTERNAL_INCSDIR= ${INCLUDEDIR}/gmock/internal > +INTERNAL_INCSDIR= ${MAIN_INCSDIR}/internal > INTERNAL_INCS+= gmock/internal/gmock-port.h > INTERNAL_INCS+= gmock/internal/gmock-internal-utils.h > INTERNAL_INCS+= gmock/internal/gmock-generated-internal-utils.h > > -INTERNAL_CUSTOM_INCSDIR= ${INCLUDEDIR}/gmock/internal/custom > +INTERNAL_CUSTOM_INCSDIR= ${INTERNAL_INCSDIR}/custom > INTERNAL_CUSTOM_INCS+= gmock/internal/custom/gmock-port.h > INTERNAL_CUSTOM_INCS+= gmock/internal/custom/gmock-matchers.h > INTERNAL_CUSTOM_INCS+= gmock/internal/custom/gmock-generated-actions.h > > Modified: projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile > ============================================================================== > --- projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile Thu Feb 21 04:13:20 2019 (r344419) > +++ projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile Thu Feb 21 04:47:44 2019 (r344420) > @@ -13,7 +13,7 @@ CXXFLAGS+= -I${GOOGLETEST_SRCROOT} > > INCSGROUPS= MAIN_INCS INTERNAL_INCS INTERNAL_CUSTOM_INCS > > -MAIN_INCSDIR= ${INCLUDEDIR}/gtest > +MAIN_INCSDIR= ${INCLUDEDIR}${PRIVATELIB:D/private/${LIB}} > MAIN_INCS+= gtest/gtest-death-test.h > MAIN_INCS+= gtest/gtest-message.h > MAIN_INCS+= gtest/gtest-param-test.h > @@ -25,7 +25,7 @@ MAIN_INCS+= gtest/gtest.h > MAIN_INCS+= gtest/gtest_pred_impl.h > MAIN_INCS+= gtest/gtest_prod.h > > -INTERNAL_INCSDIR= ${INCLUDEDIR}/gtest/internal > +INTERNAL_INCSDIR= ${MAIN_INCSDIR}/internal > INTERNAL_INCS+= gtest/internal/gtest-death-test-internal.h > INTERNAL_INCS+= gtest/internal/gtest-filepath.h > INTERNAL_INCS+= gtest/internal/gtest-internal.h > @@ -38,7 +38,7 @@ INTERNAL_INCS+= gtest/internal/gtest-string.h > INTERNAL_INCS+= gtest/internal/gtest-tuple.h > INTERNAL_INCS+= gtest/internal/gtest-type-util.h > > -INTERNAL_CUSTOM_INCSDIR= ${INCLUDEDIR}/gtest/internal/custom > +INTERNAL_CUSTOM_INCSDIR= ${INTERNAL_INCSDIR}/custom > INTERNAL_CUSTOM_INCS+= gtest/internal/custom/gtest-port.h > INTERNAL_CUSTOM_INCS+= gtest/internal/custom/gtest-printers.h > INTERNAL_CUSTOM_INCS+= gtest/internal/custom/gtest.h > > Modified: projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk > ============================================================================== > --- projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Thu Feb 21 04:13:20 2019 (r344419) > +++ projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Thu Feb 21 04:47:44 2019 (r344420) > @@ -7,3 +7,6 @@ GTESTS_CXXFLAGS+= -DGTESTS_HAS_STREAM_REDIRECTION=1 > GTESTS_CXXFLAGS+= -DGTESTS_LANG_CXX11=1 > GTESTS_CXXFLAGS+= -frtti > GTESTS_CXXFLAGS+= -std=c++11 > + > +# XXX: src.libnames.mk should handle adding this directory. > +GTESTS_CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-projects@freebsd.org Thu Feb 21 06:51:37 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1ED8714F9AD4 for ; Thu, 21 Feb 2019 06:51:37 +0000 (UTC) (envelope-from ngie@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 B5D8C9212E; Thu, 21 Feb 2019 06:51:36 +0000 (UTC) (envelope-from ngie@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 8A46919D9F; Thu, 21 Feb 2019 06:51:36 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1L6pa7m014230; Thu, 21 Feb 2019 06:51:36 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1L6pZNC014226; Thu, 21 Feb 2019 06:51:35 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902210651.x1L6pZNC014226@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Thu, 21 Feb 2019 06:51:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344424 - in projects/import-googletest-1.8.1/lib/googletest: gmock/tests gmock_main/tests gtest/tests gtest_main/tests X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1/lib/googletest: gmock/tests gmock_main/tests gtest/tests gtest_main/tests X-SVN-Commit-Revision: 344424 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B5D8C9212E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.969,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Feb 2019 06:51:37 -0000 Author: ngie Date: Thu Feb 21 06:51:35 2019 New Revision: 344424 URL: https://svnweb.freebsd.org/changeset/base/344424 Log: Reword the comment above NO_WERROR Modified: projects/import-googletest-1.8.1/lib/googletest/gmock/tests/Makefile projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Modified: projects/import-googletest-1.8.1/lib/googletest/gmock/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gmock/tests/Makefile Thu Feb 21 06:49:20 2019 (r344423) +++ projects/import-googletest-1.8.1/lib/googletest/gmock/tests/Makefile Thu Feb 21 06:51:35 2019 (r344424) @@ -8,7 +8,7 @@ GTESTS+= gmock_stress_test LIBADD+= pthread gtest gmock -# XXX: https://github.com/google/googletest/pull/2119 +# The next release will resolve a number of build warnings issues. NO_WERROR= .include Modified: projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile Thu Feb 21 06:49:20 2019 (r344423) +++ projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile Thu Feb 21 06:51:35 2019 (r344424) @@ -31,7 +31,7 @@ SRCS.gmock_link_test= \ LIBADD= gmock_main gmock gtest -# XXX: https://github.com/google/googletest/pull/2119 +# The next release will resolve a number of build warnings issues. NO_WERROR= .include Modified: projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile Thu Feb 21 06:49:20 2019 (r344423) +++ projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile Thu Feb 21 06:51:35 2019 (r344424) @@ -40,7 +40,7 @@ LIBADD+= gtest # handling this. LIBADD.gtest_stress_test+= pthread -# XXX: https://github.com/google/googletest/pull/2119 +# The next release will resolve a number of build warnings issues. NO_WERROR= .include Modified: projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Thu Feb 21 06:49:20 2019 (r344423) +++ projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Thu Feb 21 06:51:35 2019 (r344424) @@ -36,7 +36,7 @@ LIBADD+= gtest gtest_main LIBADD.googletest-port-test+= pthread LIBADD.gtest_unittest+= pthread -# XXX: https://github.com/google/googletest/pull/2119 +# The next release will resolve a number of build warnings issues. NO_WERROR= .include From owner-svn-src-projects@freebsd.org Thu Feb 21 07:54:39 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D2A9D14FB65B for ; Thu, 21 Feb 2019 07:54:38 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4E916948E9; Thu, 21 Feb 2019 07:54:38 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pf1-x42a.google.com with SMTP id d25so5001811pfn.8; Wed, 20 Feb 2019 23:54:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:message-id:mime-version:subject:date:in-reply-to:cc:to :references; bh=9GoAiPG2LEQgoV4QNFJQzBQIMhm+6qUvLvl/unLdQfM=; b=MJUzNSmpgzxr2NUUcmsLUQ1xstW1aCPHKngxPZ+9kZPf/77Fu0ZPUIkEEXNn+/GXU2 kLoI8tx/tZkeNeACGlKEc2Df5+Wwv1+81f7zSTNZIQp8eFBn3Q+Byf5s5cjLlXKBkC5k xQay0dNHV/nzLYhqWxE0iCJDPYhd0WxmEuEX+eqaoySmZ4DnvWps000HmyLc9VufDfxz 9d6HkvO7MwnCQIypVBOm8ts8+EgQGFtORka70SKwASt7I8rG2gku30mee0wZBzt0IQyv X0jCUZmdKSyJ1bCS9VYU2mMvbJlNc+TPTkJTDpvaO5TUkr5oXl1Bc8MNYDBoArxa+OHp tm+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:mime-version:subject:date :in-reply-to:cc:to:references; bh=9GoAiPG2LEQgoV4QNFJQzBQIMhm+6qUvLvl/unLdQfM=; b=E6NhyRxL8T60M0fmXf7/uuatacYY1Y20t9215d/5hYuG6FE5vw7+Md6idv6o3hzJ1d 2qFGGwBtPZOdH/E7RDp8/ZFWf1y5GeqP/dKGL5z7llSoHBF791GRww5mhpr6gaTzLTcX veMA39O2tTCAQ3nbryn+67GpjzmtWGRvsOeFlNEXOaUfqiQvoa1TI28m/sKq6Z6DtgNA +jYM/J39MT9cfdNAEmHk0wwJeiqB7zs8yI5ARqmkvmSRkppuqiTMlkYadenNe4s6yGii vnp/DymTbqFTtNkXPA5nxJRZRFrVZMouBclEcswLumWbZBhGUIr9X83GtDuxsVcz/bqU ExkQ== X-Gm-Message-State: AHQUAuZx2qQRn+sGP1UF6yg4rk0wsqpSPvUJuMoNoxJt0Zl7z3WT1IjR C5T2BkHnr97XesvJ2zgJbaC/K4sM X-Google-Smtp-Source: AHgI3IZYLWFNfFWxsnKgUSROM0JS6cIdSQqdrzoYc+TzKZ4k3ZB8yjLR5C81G9LBwyIuLESDsVLS5A== X-Received: by 2002:a62:59d0:: with SMTP id k77mr38937080pfj.211.1550735676842; Wed, 20 Feb 2019 23:54:36 -0800 (PST) Received: from [192.168.20.21] (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id v9sm23747679pgs.3.2019.02.20.23.54.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Feb 2019 23:54:36 -0800 (PST) From: "Enji Cooper (yaneurabeya)" Message-Id: Mime-Version: 1.0 (Mac OS X Mail 12.2 \(3445.102.3\)) Subject: Re: svn commit: r344420 - in projects/import-googletest-1.8.1: lib/googletest/gmock lib/googletest/gtest share/mk Date: Wed, 20 Feb 2019 23:54:34 -0800 In-Reply-To: <201902210623.x1L6NWY9018774@pdx.rh.CN85.dnsmgr.net> Cc: Enji Cooper , src-committers@freebsd.org, svn-src-projects@freebsd.org To: rgrimes@freebsd.org References: <201902210623.x1L6NWY9018774@pdx.rh.CN85.dnsmgr.net> X-Mailer: Apple Mail (2.3445.102.3) X-Rspamd-Queue-Id: 4E916948E9 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.94 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.94)[-0.937,0] Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Feb 2019 07:54:39 -0000 > On Feb 20, 2019, at 10:23 PM, Rodney W. Grimes = wrote: >=20 >> Author: ngie >> Date: Thu Feb 21 04:47:44 2019 >> New Revision: 344420 >> URL: https://svnweb.freebsd.org/changeset/base/344420 = >>=20 >> Log: >> Use gmock/gtest headers when PRIVATELIB is defined >>=20 >> The move to /usr/include/private prefixed paths seems to require a = bit more >> effort in order to compile programs. >>=20 >> Install the headers to /usr/include/private/g{mock,test}/... and = automatically >> include /usr/include/private in GTESTS_CXXFLAGS to make compilation = seamless. I >> will work on the more global problem later with @bdrewery. >=20 > Is this also hooked in to a (cd /usr/src/ && make includes) if gtest = is enabled? To clarify, are you asking if the headers are installed via =E2=80=9Cmake = includes=E2=80=9D? Yes, they were before and after this commit. The only thing that=E2=80=99s= changed is where they are installed (/usr/include/g{mock,test} -> = /usr/include/private/g{mock,test}). Cheers! -Enji= From owner-svn-src-projects@freebsd.org Thu Feb 21 07:56:39 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5C78A14FB6A5 for ; Thu, 21 Feb 2019 07:56:39 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C842494A4C; Thu, 21 Feb 2019 07:56:38 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x1L7uYnM019245; Wed, 20 Feb 2019 23:56:34 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id x1L7uYNs019244; Wed, 20 Feb 2019 23:56:34 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201902210756.x1L7uYNs019244@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r344420 - in projects/import-googletest-1.8.1: lib/googletest/gmock lib/googletest/gtest share/mk In-Reply-To: To: "Enji Cooper (yaneurabeya)" Date: Wed, 20 Feb 2019 23:56:34 -0800 (PST) CC: rgrimes@freebsd.org, Enji Cooper , src-committers@freebsd.org, svn-src-projects@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: C842494A4C X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.90 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.90)[-0.904,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Feb 2019 07:56:39 -0000 > > On Feb 20, 2019, at 10:23 PM, Rodney W. Grimes wrote: > > > >> Author: ngie > >> Date: Thu Feb 21 04:47:44 2019 > >> New Revision: 344420 > >> URL: https://svnweb.freebsd.org/changeset/base/344420 > >> > >> Log: > >> Use gmock/gtest headers when PRIVATELIB is defined > >> > >> The move to /usr/include/private prefixed paths seems to require a bit more > >> effort in order to compile programs. > >> > >> Install the headers to /usr/include/private/g{mock,test}/... and automatically > >> include /usr/include/private in GTESTS_CXXFLAGS to make compilation seamless. I > >> will work on the more global problem later with @bdrewery. > > > > Is this also hooked in to a (cd /usr/src/ && make includes) if gtest is enabled? > > To clarify, are you asking if the headers are installed via ?make includes?? Correct > > Yes, they were before and after this commit. The only thing that?s changed is where they are installed (/usr/include/g{mock,test} -> /usr/include/private/g{mock,test}). Great, thanks -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-projects@freebsd.org Fri Feb 22 04:52:12 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E072114FF7B9 for ; Fri, 22 Feb 2019 04:52:12 +0000 (UTC) (envelope-from ngie@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 7E70281612; Fri, 22 Feb 2019 04:52:12 +0000 (UTC) (envelope-from ngie@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 744714B9; Fri, 22 Feb 2019 04:52:12 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1M4qCCU010419; Fri, 22 Feb 2019 04:52:12 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1M4qC98010418; Fri, 22 Feb 2019 04:52:12 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902220452.x1M4qC98010418@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Fri, 22 Feb 2019 04:52:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344457 - projects/import-googletest-1.8.1/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/share/mk X-SVN-Commit-Revision: 344457 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7E70281612 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Feb 2019 04:52:13 -0000 Author: ngie Date: Fri Feb 22 04:52:12 2019 New Revision: 344457 URL: https://svnweb.freebsd.org/changeset/base/344457 Log: Remove redundant CXXFLAGS and fix constant names - Specifying -std=c++11 and -frtti tweaks those flags with clang/gcc. - The constants are prefixed with `GTEST_`, not `GTESTS_`. Modified: projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Modified: projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Fri Feb 22 03:11:27 2019 (r344456) +++ projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Fri Feb 22 04:52:12 2019 (r344457) @@ -1,10 +1,8 @@ # $FreeBSD$ -GTESTS_CXXFLAGS+= -DGTESTS_HAS_RTTI=1 -GTESTS_CXXFLAGS+= -DGTESTS_HAS_POSIX_RE=1 -GTESTS_CXXFLAGS+= -DGTESTS_HAS_PTHREAD=1 -GTESTS_CXXFLAGS+= -DGTESTS_HAS_STREAM_REDIRECTION=1 -GTESTS_CXXFLAGS+= -DGTESTS_LANG_CXX11=1 +GTESTS_CXXFLAGS+= -DGTEST_HAS_POSIX_RE=1 +GTESTS_CXXFLAGS+= -DGTEST_HAS_PTHREAD=1 +GTESTS_CXXFLAGS+= -DGTEST_HAS_STREAM_REDIRECTION=1 GTESTS_CXXFLAGS+= -frtti GTESTS_CXXFLAGS+= -std=c++11