unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
* [PATCH] test/libconfig: use 'export' when restoring NOTMUCH_CONFIG
@ 2021-10-27 13:20 David Bremner
  2021-10-27 18:04 ` Tomi Ollila
  2021-10-28  1:12 ` David Bremner
  0 siblings, 2 replies; 3+ messages in thread
From: David Bremner @ 2021-10-27 13:20 UTC (permalink / raw)
  To: notmuch

This is required when NOTMUCH_CONFIG has been unset, and is harmless
otherwise.
---
 test/T590-libconfig.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh
index 59b82a6f..a9566c13 100755
--- a/test/T590-libconfig.sh
+++ b/test/T590-libconfig.sh
@@ -461,7 +461,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL%
 }
 EOF
 rm -f ${ovconfig}
-NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
+export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
 cat <<'EOF' >EXPECTED
 == stdout ==
 test.key1 = overridden-home
@@ -488,7 +488,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL%
 }
 EOF
 rm -f ${ovconfig}
-NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
+export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
 cat <<'EOF' >EXPECTED
 == stdout ==
 test.key1 = overridden-xdg
@@ -515,7 +515,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% work
 }
 EOF
 rm -f ${ovconfig}
-NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
+export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
 cat <<'EOF' >EXPECTED
 == stdout ==
 test.key1 = overridden-xdg-profile
@@ -541,7 +541,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% work
 }
 EOF
 #rm -f ${ovconfig}
-NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
+export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
 cat <<'EOF' >EXPECTED
 == stdout ==
 test.key1 = overridden-profile
@@ -559,7 +559,7 @@ cat c_head - c_tail <<'EOF' | test_C %NULL% '' %NULL%
    printf("NOT RUN");
 }
 EOF
-NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
+export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
 cat <<'EOF' >EXPECTED
 == stdout ==
 == stderr ==
@@ -604,7 +604,7 @@ cat c_head - c_tail <<'EOF' | test_C %NULL% '' %NULL%
    printf("test.key2 = %s\n", val);
 }
 EOF
-NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
+export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
 unset NOTMUCH_DATABASE
 cat <<'EOF' >EXPECTED
 == stdout ==
@@ -783,7 +783,7 @@ cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL%
 }
 EOF
 rm -f ${ovconfig}
-NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
+export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
 cat <<'EOF' >EXPECTED
 == stdout ==
 test.key1 = overridden-home
-- 
2.33.0

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] test/libconfig: use 'export' when restoring NOTMUCH_CONFIG
  2021-10-27 13:20 [PATCH] test/libconfig: use 'export' when restoring NOTMUCH_CONFIG David Bremner
@ 2021-10-27 18:04 ` Tomi Ollila
  2021-10-28  1:12 ` David Bremner
  1 sibling, 0 replies; 3+ messages in thread
From: Tomi Ollila @ 2021-10-27 18:04 UTC (permalink / raw)
  To: David Bremner, notmuch

On Wed, Oct 27 2021, David Bremner wrote:

> This is required when NOTMUCH_CONFIG has been unset, and is harmless
> otherwise.

LGTM.

Tested w/ the following than the commit message is correct:

(works the same way w/ dash, bash and zsh)

--8<----8<----8<----8<--
export FOO

FOO=1

sh -c 'echo $FOO'

FOO=2

sh -c 'echo $FOO'
--8<----8<----8<----8<--


> ---
>  test/T590-libconfig.sh | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh
> index 59b82a6f..a9566c13 100755
> --- a/test/T590-libconfig.sh
> +++ b/test/T590-libconfig.sh
> @@ -461,7 +461,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL%
>  }
>  EOF
>  rm -f ${ovconfig}
> -NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
> +export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
>  cat <<'EOF' >EXPECTED
>  == stdout ==
>  test.key1 = overridden-home
> @@ -488,7 +488,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL%
>  }
>  EOF
>  rm -f ${ovconfig}
> -NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
> +export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
>  cat <<'EOF' >EXPECTED
>  == stdout ==
>  test.key1 = overridden-xdg
> @@ -515,7 +515,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% work
>  }
>  EOF
>  rm -f ${ovconfig}
> -NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
> +export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
>  cat <<'EOF' >EXPECTED
>  == stdout ==
>  test.key1 = overridden-xdg-profile
> @@ -541,7 +541,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% work
>  }
>  EOF
>  #rm -f ${ovconfig}
> -NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
> +export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
>  cat <<'EOF' >EXPECTED
>  == stdout ==
>  test.key1 = overridden-profile
> @@ -559,7 +559,7 @@ cat c_head - c_tail <<'EOF' | test_C %NULL% '' %NULL%
>     printf("NOT RUN");
>  }
>  EOF
> -NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
> +export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
>  cat <<'EOF' >EXPECTED
>  == stdout ==
>  == stderr ==
> @@ -604,7 +604,7 @@ cat c_head - c_tail <<'EOF' | test_C %NULL% '' %NULL%
>     printf("test.key2 = %s\n", val);
>  }
>  EOF
> -NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
> +export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
>  unset NOTMUCH_DATABASE
>  cat <<'EOF' >EXPECTED
>  == stdout ==
> @@ -783,7 +783,7 @@ cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL%
>  }
>  EOF
>  rm -f ${ovconfig}
> -NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
> +export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG}
>  cat <<'EOF' >EXPECTED
>  == stdout ==
>  test.key1 = overridden-home
> -- 
> 2.33.0
>
> _______________________________________________
> notmuch mailing list -- notmuch@notmuchmail.org
> To unsubscribe send an email to notmuch-leave@notmuchmail.org

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] test/libconfig: use 'export' when restoring NOTMUCH_CONFIG
  2021-10-27 13:20 [PATCH] test/libconfig: use 'export' when restoring NOTMUCH_CONFIG David Bremner
  2021-10-27 18:04 ` Tomi Ollila
@ 2021-10-28  1:12 ` David Bremner
  1 sibling, 0 replies; 3+ messages in thread
From: David Bremner @ 2021-10-28  1:12 UTC (permalink / raw)
  To: notmuch

David Bremner <david@tethera.net> writes:

> This is required when NOTMUCH_CONFIG has been unset, and is harmless
> otherwise.

Applied to release and master. I have more interesting bug fixes for a
point release that depend on this one.

d

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-10-28  1:13 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-27 13:20 [PATCH] test/libconfig: use 'export' when restoring NOTMUCH_CONFIG David Bremner
2021-10-27 18:04 ` Tomi Ollila
2021-10-28  1:12 ` David Bremner

Code repositories for project(s) associated with this inbox:

	notmuch.git.git (no URL configured)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).