From: David Bremner <david@tethera.net>
Date: Fri, 25 Nov 2016 01:21:16 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Tag: 0.24_rc0~76
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=d35c2c15f61cb527eea6e6224d8b0ad965100766;hp=-c

Merge branch 'release'

Initial set of changes for 0.23.3
---

d35c2c15f61cb527eea6e6224d8b0ad965100766
diff --combined test/test-lib.sh
index a12c6d0a,86e792a8..f55d2c67
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@@ -624,15 -624,15 +624,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")"
@@@ -736,7 -736,8 +736,8 @@@ notmuch_json_show_sanitize (
  	-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|"timestamp": 97.......|"timestamp": 42|g'
+ 	-e 's|"timestamp": 97.......|"timestamp": 42|g' \
+         -e 's|"content-length": [1-9][0-9]*|"content-length": "NONZERO"|g'
  }
  
  notmuch_emacs_error_sanitize ()