Re: [PATCH] test/libconfig: use 'export' when restoring NOTMUCH_CONFIG
David Bremner 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 ___ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-le...@notmuchmail.org
Re: [PATCH] test/libconfig: use 'export' when restoring NOTMUCH_CONFIG
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-le...@notmuchmail.org ___ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-le...@notmuchmail.org
[PATCH] test/libconfig: use 'export' when restoring NOTMUCH_CONFIG
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 ___ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-le...@notmuchmail.org