test/libconfig: use 'export' when restoring NOTMUCH_CONFIG

This is required when NOTMUCH_CONFIG has been unset, and is harmless
otherwise.
This commit is contained in:
David Bremner 2021-10-27 10:20:40 -03:00
parent f25e48e023
commit e2b842afb1

View file

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