Re: [PATCH] perf-tests: #!/bin/bash -> #!/usr/bin/env bash

[Tomi Ollila]

On Fri, May 31 2019, William Casarin wrote:

> I couldn't run the performance tests on my machines due to a hardcoded
> bash path. Use env for finding bash in weird systems like NixOS.

Not so weird -- probably most non-Linux OS's that have bash,
have bash somewhere else than in /bin/.

LGTM.

Tomi

>
> Signed-off-by: William Casarin 
> ---
>  performance-test/M00-new.sh | 2 +-
>  performance-test/M01-dump-restore.sh| 2 +-
>  performance-test/M02-show.sh| 2 +-
>  performance-test/M03-search.sh  | 2 +-
>  performance-test/M04-reply.sh   | 2 +-
>  performance-test/M05-reindex.sh | 2 +-
>  performance-test/M06-insert.sh  | 2 +-
>  performance-test/T00-new.sh | 2 +-
>  performance-test/T01-dump-restore.sh| 2 +-
>  performance-test/T02-tag.sh | 2 +-
>  performance-test/T03-reindex.sh | 2 +-
>  performance-test/T04-thread-subquery.sh | 2 +-
>  12 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/performance-test/M00-new.sh b/performance-test/M00-new.sh
> index aab36e69..5858ab33 100755
> --- a/performance-test/M00-new.sh
> +++ b/performance-test/M00-new.sh
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  
>  test_description='notmuch new'
>  
> diff --git a/performance-test/M01-dump-restore.sh 
> b/performance-test/M01-dump-restore.sh
> index 32ab8dc9..7850b411 100755
> --- a/performance-test/M01-dump-restore.sh
> +++ b/performance-test/M01-dump-restore.sh
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  
>  test_description='dump and restore'
>  
> diff --git a/performance-test/M02-show.sh b/performance-test/M02-show.sh
> index 2e218fd3..40c5d4d7 100755
> --- a/performance-test/M02-show.sh
> +++ b/performance-test/M02-show.sh
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  
>  test_description='show'
>  
> diff --git a/performance-test/M03-search.sh b/performance-test/M03-search.sh
> index 343f5c7c..a73a36ab 100755
> --- a/performance-test/M03-search.sh
> +++ b/performance-test/M03-search.sh
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  
>  test_description='search'
>  
> diff --git a/performance-test/M04-reply.sh b/performance-test/M04-reply.sh
> index 3c1205db..3b0f9e78 100755
> --- a/performance-test/M04-reply.sh
> +++ b/performance-test/M04-reply.sh
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  
>  test_description='search'
>  
> diff --git a/performance-test/M05-reindex.sh b/performance-test/M05-reindex.sh
> index 17e2c824..8ea7e7ee 100755
> --- a/performance-test/M05-reindex.sh
> +++ b/performance-test/M05-reindex.sh
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  
>  test_description='reindex'
>  
> diff --git a/performance-test/M06-insert.sh b/performance-test/M06-insert.sh
> index 5ae0656a..12330c76 100755
> --- a/performance-test/M06-insert.sh
> +++ b/performance-test/M06-insert.sh
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  
>  test_description='search'
>  
> diff --git a/performance-test/T00-new.sh b/performance-test/T00-new.sh
> index 25391136..a14dd13f 100755
> --- a/performance-test/T00-new.sh
> +++ b/performance-test/T00-new.sh
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  
>  test_description='notmuch new'
>  
> diff --git a/performance-test/T01-dump-restore.sh 
> b/performance-test/T01-dump-restore.sh
> index 12f12e66..2a53e3b8 100755
> --- a/performance-test/T01-dump-restore.sh
> +++ b/performance-test/T01-dump-restore.sh
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  
>  test_description='dump and restore'
>  
> diff --git a/performance-test/T02-tag.sh b/performance-test/T02-tag.sh
> index 8c5dfd68..9c895d6a 100755
> --- a/performance-test/T02-tag.sh
> +++ b/performance-test/T02-tag.sh
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  
>  test_description='tagging'
>  
> diff --git a/performance-test/T03-reindex.sh b/performance-test/T03-reindex.sh
> index 8e0a77f4..8db52a33 100755
> --- a/performance-test/T03-reindex.sh
> +++ b/performance-test/T03-reindex.sh
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  
>  test_description='reindexing'
>  
> diff --git a/performance-test/T04-thread-subquery.sh 
> b/performance-test/T04-thread-subquery.sh
> index 665d5a64..ba81f383 100755
> --- a/performance-test/T04-thread-subquery.sh
> +++ b/performance-test/T04-thread-subquery.sh
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  
>  test_description='thread subqueries'
>  
> -- 
> 2.21.0
>
> ___
> notmuch mailing list
> notmuch@notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH] doc: use separate doctrees for distinct builders

[Tomi Ollila]

On Fri, May 31 2019, David Bremner wrote:

> It seems our previous attempt with order-only targets was not
> sufficient to avoid problems with sphinx-builds doctree cache [0].
> Looking around at other people's approaches [1], using seperate

probably good, but you may want to s/seperate/separate/

Tomi

> doctrees was suggested. I guess there might be a slight loss of
> efficiency, but it seems more robust.
>
> [0]: build failures were first noticed in debian experimental, but I was able 
> to duplicate it in
>  my usual build environment about 1 in 8 builds.
>
> [1]: in particular
>  
> https://salsa.debian.org/mpd-team/mpc/commit/9e3fc1657d043d75755993846c93f7700b97f907
> ---
>  doc/Makefile.local | 16 
>  1 file changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/doc/Makefile.local b/doc/Makefile.local
> index 651168f4..719172fe 100644
> --- a/doc/Makefile.local
> +++ b/doc/Makefile.local
> @@ -8,7 +8,7 @@ SPHINXBUILD   = HAVE_EMACS=${HAVE_EMACS} sphinx-build
>  DOCBUILDDIR  := $(dir)/_build
>  
>  # Internal variables.
> -ALLSPHINXOPTS   := -d $(DOCBUILDDIR)/doctrees $(SPHINXOPTS) $(srcdir)/$(dir)
> +ALLSPHINXOPTS   := $(SPHINXOPTS) $(srcdir)/$(dir)
>  APIMAN   := $(DOCBUILDDIR)/man/man3/notmuch.3
>  DOXYFILE := $(srcdir)/$(dir)/doxygen.cfg
>  
> @@ -42,24 +42,16 @@ ifeq ($(WITH_EMACS),1)
>  $(DOCBUILDDIR)/.roff.stamp sphinx-html sphinx-texinfo: docstring.stamp
>  endif
>  
> -# Sequentialize the calls to sphinx-build to avoid races with
> -# reading/writing cached state. This uses GNU make specific
> -# "order-only" prerequisites.
> -
> -sphinx-html: | $(DOCBUILDDIR)/.roff.stamp
> -sphinx-texinfo: | sphinx-html
> -sphinx-info: | sphinx-texinfo
> -
>  sphinx-html: $(DOCBUILDDIR)/.html.stamp
>  
>  $(DOCBUILDDIR)/.html.stamp: $(ALL_RST_FILES)
> - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(DOCBUILDDIR)/html
> + $(SPHINXBUILD) -b html -d $(DOCBUILDDIR)/html_doctrees $(ALLSPHINXOPTS) 
> $(DOCBUILDDIR)/html
>   touch $@
>  
>  sphinx-texinfo: $(DOCBUILDDIR)/.texi.stamp
>  
>  $(DOCBUILDDIR)/.texi.stamp: $(ALL_RST_FILES)
> - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(DOCBUILDDIR)/texinfo
> + $(SPHINXBUILD) -b texinfo -d $(DOCBUILDDIR)/texinfo_doctrees 
> $(ALLSPHINXOPTS) $(DOCBUILDDIR)/texinfo
>   touch $@
>  
>  sphinx-info: sphinx-texinfo
> @@ -75,7 +67,7 @@ ${MAN_ROFF_FILES}: $(DOCBUILDDIR)/.roff.stamp
>  # instance of this recipe for each roff file.
>  $(DOCBUILDDIR)/.roff.stamp: ${MAN_RST_FILES}
>  ifeq ($(HAVE_SPHINX),1)
> - $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(DOCBUILDDIR)/man
> + $(SPHINXBUILD) -b man -d $(DOCBUILDDIR)/man_doctrees $(ALLSPHINXOPTS) 
> $(DOCBUILDDIR)/man
>   for section in 1 5 7; do \
>   mkdir -p $(DOCBUILDDIR)/man/man$${section}; \
>   mv $(DOCBUILDDIR)/man/*.$${section} 
> $(DOCBUILDDIR)/man/man$${section}; \
> -- 
> 2.20.1
>
> ___
> notmuch mailing list
> notmuch@notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch