From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id CNZgFrLxzWB77AAAgWs5BA (envelope-from ) for ; Sat, 19 Jun 2021 15:31:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id OFjlEbLxzWBgKgAA1q6Kng (envelope-from ) for ; Sat, 19 Jun 2021 13:31:30 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CC3A420ADB for ; Sat, 19 Jun 2021 15:31:29 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id BDC722B28B; Sat, 19 Jun 2021 09:31:23 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 62BCE2B223 for ; Sat, 19 Jun 2021 09:31:20 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 217915FD25; Sat, 19 Jun 2021 09:31:20 -0400 (EDT) Received: (nullmailer pid 2392982 invoked by uid 1000); Sat, 19 Jun 2021 13:31:18 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH] test/libconfig: make indexing more consistent Date: Sat, 19 Jun 2021 10:31:16 -0300 Message-Id: <20210619133116.2392932-1-david@tethera.net> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Message-ID-Hash: G26KQVRVI63QICXJL2A6OAHGYFFEYQWL X-Message-ID-Hash: G26KQVRVI63QICXJL2A6OAHGYFFEYQWL X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1624109490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=wIvEpIbTpw+y/x0FGPXZWda0PzR5XCCRGEk16much2U=; b=otHGN20J9SINgXOW2fR+o8Tx0ydu8F7rzy7gHToQSYs1GckBId1lI3wpuENO5IMQc/1qIy ek4VjuYu4bf3vQmuX2bBk1FMmpEIwjhkF/Q4U1fnmJT0S4A3x0F1/9h2b+MScnzAlVzTJL tH+pNCg3VqlvnX7SzL3tM/C4QvxUq4LzCVXrPRcUKVE9CJGLY28N8k0BCr8QbYzQFNYXe2 cmUXvVD08QSZMBlNQ2UAKpbTI7takyHjdJurkcHzmyfWlROIVxeS1it/uyCP19oyCcjLOE 5cqSejK0b9RdRq/hB+voq1oEJlZFN/M4OQT5pfCKbN5P8uknz1c3dHyYFttJxQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624109490; a=rsa-sha256; cv=none; b=SBBAMWL9+DhGsTnU0mAP+H9vh5Nzca+52ekBz6lX6+llnL/SDmBiPM+L25vc/76/Y7Jy8X KtWBQAbVciwkrS/7b+ojQjbAqP7XRdR6UNdazKR2ly9T2EOE0cP2Fua/JCYj/wM1UPni6Q 4A6woA31miaK67o3Mw3JebdfHWRIqdXIf4fNtAkySP7krIbj/hov3fJVfBJX1H+2o5GgHK VuFKywBWZfLKWiRhKesTgpDX6e+U6ZXvLTlrHkiVEJoZMgpC5WfN2i4XGw4ZiLXeoompyo 8fdnHUWq+SXq36Oh4r4IM3trk5+Hu8pYj62PklT7eeg5SfzZPvCQzU6wXD0bUg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.06 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: CC3A420ADB X-Spam-Score: -1.06 X-Migadu-Scanner: scn1.migadu.com X-TUID: sHG5HJEzZTLC The other tests have converted to two digit decimal, the commit does the same to the remaining test that was printing out indices in hex. --- test/T590-libconfig.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh index bc7298f8..189381f7 100755 --- a/test/T590-libconfig.sh +++ b/test/T590-libconfig.sh @@ -713,23 +713,23 @@ cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL% key < NOTMUCH_CONFIG_LAST; key = (notmuch_config_key_t)(key + 1)) { const char *val = notmuch_config_get (db, key); - printf("%x: '%s'\n", key, val ? val : "NULL" ); + printf("%02d: '%s'\n", key, val ? val : "NULL" ); } } EOF cat <<'EOF' >EXPECTED == stdout == -0: 'MAIL_DIR' -1: 'MAIL_DIR' -2: 'MAIL_DIR/.notmuch/hooks' -3: 'MAIL_DIR/.notmuch/backups' -4: 'foo;bar;fub' -5: 'unread;inbox' -6: 'sekrit_junk' -7: 'true' -8: 'test_suite@notmuchmail.org' -9: 'test_suite_other@notmuchmail.org;test_suite@otherdomain.org' -a: 'Notmuch Test Suite' +00: 'MAIL_DIR' +01: 'MAIL_DIR' +02: 'MAIL_DIR/.notmuch/hooks' +03: 'MAIL_DIR/.notmuch/backups' +04: 'foo;bar;fub' +05: 'unread;inbox' +06: 'sekrit_junk' +07: 'true' +08: 'test_suite@notmuchmail.org' +09: 'test_suite_other@notmuchmail.org;test_suite@otherdomain.org' +10: 'Notmuch Test Suite' == stderr == EOF test_expect_equal_file EXPECTED OUTPUT -- 2.30.2