From: Tomi Ollila Date: Tue, 28 Oct 2014 21:32:11 +0000 (+0200) Subject: Re: [PATCH] test: use LDFLAGS in test/Makefile.local X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=48c444196b2ebb6ca96c3295bdbee45b36d96ac6;p=notmuch-archives.git Re: [PATCH] test: use LDFLAGS in test/Makefile.local --- diff --git a/9f/56cfc3fac3ff9c257f77fd1ec9e5636eacf349 b/9f/56cfc3fac3ff9c257f77fd1ec9e5636eacf349 new file mode 100644 index 000000000..43fc1dacb --- /dev/null +++ b/9f/56cfc3fac3ff9c257f77fd1ec9e5636eacf349 @@ -0,0 +1,125 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 94EB3431FBC + for ; Tue, 28 Oct 2014 14:32:36 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id NB2mmMHQy7Nb for ; + Tue, 28 Oct 2014 14:32:29 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 665F5431FB6 + for ; Tue, 28 Oct 2014 14:32:29 -0700 (PDT) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id 933CB100051; + Tue, 28 Oct 2014 23:32:11 +0200 (EET) +From: Tomi Ollila +To: Jani Nikula , notmuch@notmuchmail.org +Subject: Re: [PATCH] test: use LDFLAGS in test/Makefile.local +In-Reply-To: <1413817401-6058-1-git-send-email-jani@nikula.org> +References: <1413817401-6058-1-git-send-email-jani@nikula.org> +User-Agent: Notmuch/0.18.1+130~ga61922f (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Tue, 28 Oct 2014 21:32:36 -0000 + +On Mon, Oct 20 2014, Jani Nikula wrote: + +> Apparently the test binaries are built with minimal LDFLAGS, only +> adding dependency specific LDFLAGS as needed. However because some of +> the test binaries incorporate notmuch object files, it is necessary to +> use the same link flags as notmuch. For example user provided +> CFLAGS/CXXFLAGS/LDFLAGS with -fsanitize=undefined fails to build the +> test binaries if the flags differ. +> +> --- +> +> With this I could do +> +> CFLAGS="-fsanitize=undefined -g" CXXFLAGS="-fsanitize=undefined -g" LDFLAGS="-fsanitize=undefined -g" ./configure +> +> to try ubsan with gcc 4.9. No problems found while running make test +> (and it did find an UB I planted to ensure I had it all set up right). +> --- +> test/Makefile.local | 14 +++++++------- +> 1 file changed, 7 insertions(+), 7 deletions(-) +> +> diff --git a/test/Makefile.local b/test/Makefile.local +> index a2d58fc1a1b0..2331ceb15e33 100644 +> --- a/test/Makefile.local +> +++ b/test/Makefile.local +> @@ -13,10 +13,10 @@ smtp_dummy_srcs = \ +> smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o) +> +> $(dir)/arg-test: $(dir)/arg-test.o command-line-arguments.o util/libutil.a +> - $(call quiet,CC) $^ -o $@ +> + $(call quiet,CC) $^ -o $@ $(LDFLAGS) +> +> $(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libutil.a +> - $(call quiet,CC) $^ $(TALLOC_LDFLAGS) -o $@ +> + $(call quiet,CC) $^ -o $@ $(LDFLAGS) $(TALLOC_LDFLAGS) + +LGTM; especially the above change which moves all *LDFLAGS after -o $@... + +Tomi + +> +> random_corpus_deps = $(dir)/random-corpus.o $(dir)/database-test.o \ +> notmuch-config.o command-line-arguments.o \ +> @@ -24,19 +24,19 @@ random_corpus_deps = $(dir)/random-corpus.o $(dir)/database-test.o \ +> parse-time-string/libparse-time-string.a +> +> $(dir)/random-corpus: $(random_corpus_deps) +> - $(call quiet,CXX) $(CFLAGS_FINAL) $^ -o $@ $(CONFIGURE_LDFLAGS) +> + $(call quiet,CXX) $^ -o $@ $(LDFLAGS) $(CONFIGURE_LDFLAGS) +> +> $(dir)/smtp-dummy: $(smtp_dummy_modules) +> - $(call quiet,CC) $^ -o $@ +> + $(call quiet,CC) $^ -o $@ $(LDFLAGS) +> +> $(dir)/symbol-test: $(dir)/symbol-test.o lib/$(LINKER_NAME) +> - $(call quiet,CXX) $^ -o $@ -Llib -lnotmuch $(XAPIAN_LDFLAGS) +> + $(call quiet,CXX) $^ -o $@ $(LDFLAGS) -Llib -lnotmuch $(XAPIAN_LDFLAGS) +> +> $(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o +> - $(call quiet,CC) $^ -o $@ +> + $(call quiet,CC) $^ -o $@ $(LDFLAGS) +> +> $(dir)/make-db-version: $(dir)/make-db-version.o +> - $(call quiet,CXX) $^ -o $@ $(XAPIAN_LDFLAGS) +> + $(call quiet,CXX) $^ -o $@ $(LDFLAGS) $(XAPIAN_LDFLAGS) +> +> .PHONY: test check +> +> -- +> 2.1.1 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch