On Sun, Oct 24 2021, David Bremner wrote:

> Because the file to be removed has a predictable name, we can hard
> code it in the generated shim.

I am not sure about the message above -- the file name is as predictable
as it was before -- and the shim code is created dynamically, with same
amout of flexibility as it was w/ the gdb script

Anyway I ignore if the same message appears in style-fixed email
(see below)...

Tomi

> ---
>  test/T050-new.sh    | 44 ++++++++++++++++++++++++--------------------
>  test/notmuch-test.h |  1 +
>  2 files changed, 25 insertions(+), 20 deletions(-)
>
> diff --git a/test/T050-new.sh b/test/T050-new.sh
> index 1141c1e3..5a03998b 100755
> --- a/test/T050-new.sh
> +++ b/test/T050-new.sh
> @@ -368,31 +368,35 @@ chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.*
>  test_expect_equal "$output" "A Xapian exception occurred opening database"
>  
>  
> +make_shim dif-shim<<EOF
> +#include <notmuch-test.h>
> +notmuch_status_t
> +notmuch_database_index_file (notmuch_database_t *database,
> +			     const char *filename,
> +			     notmuch_indexopts_t *indexopts,
> +			     notmuch_message_t **message)
> +{
> +  static notmuch_status_t (*orig_notmuch_database_index_file)
> +    (notmuch_database_t *database,
> +     const char *filename,
> +     notmuch_indexopts_t *indexopts,
> +     notmuch_message_t **message) = NULL;
> +  TEST_SAVE_ORIG(notmuch_database_index_file);
> +
> +  if (unlink("${MAIL_DIR}/vanish")) {
> +     fprintf(stderr, "unlink failed\n");
> +     exit(42);

style not 'exit (42)' like in sources, and in previous change -- mostly
in previous change, there was also at least one fn() use, which I failed
to comment... anyway, asking for consistent style.

> +  }
> +  return orig_notmuch_database_index_file(database, filename, indexopts, message);
> +}
> +EOF
> +
>  test_begin_subtest "Handle files vanishing between scandir and add_file"
>  
>  # A file for scandir to find. It won't get indexed, so can be empty.
>  touch ${MAIL_DIR}/vanish
> -
> -# Breakpoint to remove the file before indexing
> -cat <<EOF > notmuch-new-vanish.gdb
> -set breakpoint pending on
> -set logging file notmuch-new-vanish-gdb.log
> -set logging on
> -break notmuch_database_index_file
> -commands
> -shell rm -f ${MAIL_DIR}/vanish
> -continue
> -end
> -run
> -EOF
> -
> -${TEST_GDB} --batch-silent --return-child-result -x notmuch-new-vanish.gdb \
> -    --args notmuch new 2>OUTPUT 1>/dev/null
> +notmuch_with_shim dif-shim new 2>OUTPUT 1>/dev/null
>  echo "exit status: $?" >> OUTPUT
> -
> -# Clean up the file in case gdb isn't available.
> -rm -f ${MAIL_DIR}/vanish
> -
>  cat <<EOF > EXPECTED
>  Unexpected error with file ${MAIL_DIR}/vanish
>  add_file: Something went wrong trying to read or write a file
> diff --git a/test/notmuch-test.h b/test/notmuch-test.h
> index 8613a299..94348d69 100644
> --- a/test/notmuch-test.h
> +++ b/test/notmuch-test.h
> @@ -7,6 +7,7 @@
>  #include <sys/types.h>
>  #include <sys/stat.h>
>  #include <fcntl.h>
> +#include <unistd.h>
>  
>  inline static void
>  expect0 (int line, notmuch_status_t ret)
> -- 
> 2.33.0
_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-leave@notmuchmail.org