From: David Bremner <david@tethera.net>
Date: Wed, 1 Mar 2017 01:21:07 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Tag: 0.24_rc0~16
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=508b5c20fa38b17fa527af075857061f4ed81e2a;hp=-c;p=notmuch

Merge branch 'release'

Second gnugpg test suite fix
---

508b5c20fa38b17fa527af075857061f4ed81e2a
diff --combined configure
index d0d8f18a,f1773044..fa77eb8f
--- a/configure
+++ b/configure
@@@ -70,7 -70,6 +70,7 @@@ LIBDIR
  WITH_DOCS=1
  WITH_API_DOCS=1
  WITH_EMACS=1
 +WITH_DESKTOP=1
  WITH_BASH=1
  WITH_RUBY=1
  WITH_ZSH=1
@@@ -142,7 -141,6 +142,7 @@@ Some features can be disabled (--with-f
  	--without-docs			Do not install documentation
  	--without-api-docs		Do not install API man page
  	--without-emacs			Do not install lisp file
 +	--without-desktop		Do not install desktop file
  	--without-ruby			Do not install ruby bindings
  	--without-zsh-completion	Do not install zsh completions files
  	--without-retry-lock		Do not use blocking xapian opens, even if available
@@@ -211,14 -209,6 +211,14 @@@ for option; d
  	fi
      elif [ "${option}" = '--without-emacs' ] ; then
  	WITH_EMACS=0
 +    elif [ "${option%%=*}" = '--with-desktop' ]; then
 +	if [ "${option#*=}" = 'no' ]; then
 +	    WITH_DESKTOP=0
 +	else
 +	    WITH_DESKTOP=1
 +	fi
 +    elif [ "${option}" = '--without-desktop' ] ; then
 +	WITH_DESKTOP=0
      elif [ "${option%%=*}" = '--with-bash-completion' ]; then
  	if [ "${option#*=}" = 'no' ]; then
  	    WITH_BASH=0
@@@ -612,29 -602,6 +612,16 @@@ if [ $WITH_DOCS = "1" ] ; the
      fi
  fi
  
- have_gpgconf_socketdir=0
- printf "Checking for gpgconf --{create,remove}-socketdir... "
- if gpgconf --dump-options > /dev/null ; then
-     if gpgconf --dump-options | grep -q create-socketdir ; then
- 	printf "Yes.\n"
- 	have_gpgconf_socketdir=1
-     else
- 	printf "No.\n"
-     fi
- else
-     printf "No. (missing or broken gpgconf?)\n"
- fi
- 
 +if [ $WITH_DESKTOP = "1" ]; then
 +    printf "Checking if desktop-file-install is available... "
 +    if command -v desktop-file-install > /dev/null; then
 +	printf "Yes.\n"
 +    else
 +	printf "No (so will not install .desktop file).\n"
 +	WITH_DESKTOP=0
 +    fi
 +fi
 +
  libdir_in_ldconfig=0
  
  printf "Checking which platform we are on... "
@@@ -693,6 -660,19 +680,6 @@@ els
  EOF
  fi
  
 -printf "Checking byte order... "
 -cat> _byteorder.c <<EOF
 -#include <stdio.h>
 -#include <stdint.h>
 -uint32_t test = 0x34333231;
 -int main() { printf("%.4s\n", (const char*)&test); return 0; }
 -EOF
 -${CC} ${CFLAGS} _byteorder.c -o _byteorder > /dev/null 2>&1
 -util_byte_order=$(./_byteorder)
 -echo $util_byte_order
 -
 -rm -f _byteorder _byteorder.c
 -
  if [ $errors -gt 0 ]; then
      cat <<EOF
  
@@@ -1012,6 -992,9 +999,6 @@@ prefix = ${PREFIX
  # LIBDIR_IN_LDCONFIG value below is still set correctly.
  libdir = ${LIBDIR:=\$(prefix)/lib}
  
 -# byte order within a 32 bit word. 1234 = little, 4321 = big, 0 = guess
 -UTIL_BYTE_ORDER = ${util_byte_order}
 -
  # Whether libdir is in a path configured into ldconfig
  LIBDIR_IN_LDCONFIG = ${libdir_in_ldconfig}
  
@@@ -1140,9 -1123,6 +1127,9 @@@ VALGRIND_CFLAGS = ${valgrind_cflags
  # Support for emacs
  WITH_EMACS = ${WITH_EMACS}
  
 +# Support for desktop file
 +WITH_DESKTOP = ${WITH_DESKTOP}
 +
  # Support for bash completion
  WITH_BASH = ${WITH_BASH}
  
@@@ -1162,9 -1142,9 +1149,9 @@@ COMMON_CONFIGURE_CFLAGS = \
  	-DSTD_GETPWUID=\$(STD_GETPWUID)				\\
  	-DSTD_ASCTIME=\$(STD_ASCTIME)				\\
  	-DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT)		\\
 +	-DSILENCE_XAPIAN_DEPRECATION_WARNINGS			\\
  	-DHAVE_XAPIAN_FIELD_PROCESSOR=\$(HAVE_XAPIAN_FIELD_PROCESSOR) \\
 -	-DHAVE_XAPIAN_DB_RETRY_LOCK=\$(HAVE_XAPIAN_DB_RETRY_LOCK) \\
 -	-DUTIL_BYTE_ORDER=\$(UTIL_BYTE_ORDER)
 +	-DHAVE_XAPIAN_DB_RETRY_LOCK=\$(HAVE_XAPIAN_DB_RETRY_LOCK)
  
  CONFIGURE_CFLAGS = \$(COMMON_CONFIGURE_CFLAGS)
  
@@@ -1199,9 -1179,6 +1186,6 @@@ NOTMUCH_PYTHON=${python
  # Are the ruby development files (and ruby) available? If not skip
  # building/testing ruby bindings.
  NOTMUCH_HAVE_RUBY_DEV=${have_ruby_dev}
- 
- # Recent enough gnupg to support gpgconf --create-socketdir?
- NOTMUCH_HAVE_GPGCONF_SOCKETDIR=${have_gpgconf_socketdir}
  EOF
  
  # Finally, after everything configured, inform the user how to continue.
diff --combined test/test-lib.sh
index d8e15943,518d9c7f..02634ac1
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@@ -80,7 -80,6 +80,7 @@@ if [[ ( -n "$TEST_EMACS" && -z "$TEST_E
  fi
  TEST_EMACS=${TEST_EMACS:-${EMACS:-emacs}}
  TEST_EMACSCLIENT=${TEST_EMACSCLIENT:-emacsclient}
 +TEST_GDB=${TEST_GDB:-gdb}
  TEST_CC=${TEST_CC:-cc}
  TEST_CFLAGS=${TEST_CFLAGS:-"-g -O0"}
  
@@@ -230,19 -229,10 +230,10 @@@ test_fixed=
  test_broken=0
  test_success=0
  
- 
- _shutdown_gpg_agent () {
-     if [ ${NOTMUCH_HAVE_GPGCONF_SOCKETDIR} = 1 ]; then
- 	gpgconf --kill gpg-agent
- 	gpgconf --remove-socketdir
-     fi
- }
- 
  _exit_common () {
  	code=$?
  	trap - EXIT
  	set +ex
- 	_shutdown_gpg_agent
  	rm -rf "$TEST_TMPDIR"
  }
  
@@@ -280,6 -270,8 +271,8 @@@ die () 
  GIT_EXIT_OK=
  # Note: TEST_TMPDIR *NOT* exported!
  TEST_TMPDIR=$(mktemp -d "${TMPDIR:-/tmp}/notmuch-test-$$.XXXXXX")
+ # Put GNUPGHOME in TMPDIR to avoid problems with long paths.
+ export GNUPGHOME="${TEST_TMPDIR}/gnupg"
  trap 'trap_exit' EXIT
  trap 'trap_signal' HUP INT TERM
  
@@@ -634,15 -626,15 +627,15 @@@ test_expect_equal_file (
  	error "bug in the test script: not 2 or 3 parameters to test_expect_equal"
  
  	file1="$1"
 -	basename1=`basename "$file1"`
  	file2="$2"
 -	basename2=`basename "$file2"`
  	if ! test_skip "$test_subtest_name"
  	then
  		if diff -q "$file1" "$file2" >/dev/null ; then
  			test_ok_
  		else
  			testname=$this_test.$test_count
 +			basename1=`basename "$file1"`
 +			basename2=`basename "$file2"`
  			cp "$file1" "$testname.$basename1"
  			cp "$file2" "$testname.$basename2"
  			test_failure_ "$(diff -u "$testname.$basename1" "$testname.$basename2")"
@@@ -667,7 -659,7 +660,7 @@@ test_expect_equal_json () 
  
  # Sort the top-level list of JSON data from stdin.
  test_sort_json () {
 -    PYTHONIOENCODING=utf-8 python -c \
 +    PYTHONIOENCODING=utf-8 $NOTMUCH_PYTHON -c \
          "import sys, json; json.dump(sorted(json.load(sys.stdin)),sys.stdout)"
  }
  
@@@ -745,7 -737,7 +738,7 @@@ notmuch_json_show_sanitize (
  	-e 's|"id": "[^"]*",|"id": "XXXXX",|g' \
  	-e 's|"Date": "Fri, 05 Jan 2001 [^"]*0000"|"Date": "GENERATED_DATE"|g' \
  	-e 's|"filename": "signature.asc",||g' \
 -	-e 's|"filename": "/[^"]*",|"filename": "YYYYY",|g' \
 +	-e 's|"filename": \["/[^"]*"\],|"filename": \["YYYYY"\],|g' \
  	-e 's|"timestamp": 97.......|"timestamp": 42|g' \
          -e 's|"content-length": [1-9][0-9]*|"content-length": "NONZERO"|g'
  }
@@@ -1286,11 -1278,6 +1279,6 @@@ test_init_ () 
  
  . ./test-lib-common.sh || exit 1
  
- # we need the setting of GNUPGHOME in test-lib-common.sh
- if [ ${NOTMUCH_HAVE_GPGCONF_SOCKETDIR} = 1 ]; then
-     gpgconf --create-socketdir
- fi
- 
  emacs_generate_script
  
  
@@@ -1394,7 -1381,7 +1382,7 @@@ esa
  test_declare_external_prereq dtach
  test_declare_external_prereq emacs
  test_declare_external_prereq ${TEST_EMACSCLIENT}
 -test_declare_external_prereq gdb
 +test_declare_external_prereq ${TEST_GDB}
  test_declare_external_prereq gpg
  test_declare_external_prereq openssl
  test_declare_external_prereq gpgsm