From: David Bremner <david@tethera.net>
To: Istvan Marko <notmuch@kismala.com>, Jani Nikula <jani@nikula.org>,
notmuch@notmuchmail.org
Subject: [PATCH 2/4] test: factor out some boilerplate from C tests
Date: Sat, 4 Jun 2016 09:29:14 -0300 [thread overview]
Message-ID: <1465043356-23420-3-git-send-email-david@tethera.net> (raw)
In-Reply-To: <1465043356-23420-1-git-send-email-david@tethera.net>
The trick of having a common header file doesn't work to share between
test scripts, so make an include file in the test directory.
---
test/T590-libconfig.sh | 39 ++++++++++++++-------------------------
test/notmuch-test.h | 15 +++++++++++++++
test/test-lib.sh | 2 +-
3 files changed, 30 insertions(+), 26 deletions(-)
create mode 100644 test/notmuch-test.h
diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh
index 9c1e566..e8c078d 100755
--- a/test/T590-libconfig.sh
+++ b/test/T590-libconfig.sh
@@ -6,20 +6,9 @@ test_description="library config API"
add_email_corpus
cat <<EOF > c_head
-#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <notmuch.h>
-
-void run(int line, notmuch_status_t ret)
-{
- if (ret) {
- fprintf (stderr, "line %d: %s\n", line, ret);
- exit (1);
- }
-}
-
-#define RUN(v) run(__LINE__, v);
+#include <notmuch-test.h>
int main (int argc, char** argv)
{
@@ -27,23 +16,23 @@ int main (int argc, char** argv)
char *val;
notmuch_status_t stat;
- RUN(notmuch_database_open (argv[1], NOTMUCH_DATABASE_MODE_READ_WRITE, &db));
+ EXPECT0(notmuch_database_open (argv[1], NOTMUCH_DATABASE_MODE_READ_WRITE, &db));
EOF
cat <<EOF > c_tail
- RUN(notmuch_database_destroy(db));
+ EXPECT0(notmuch_database_destroy(db));
}
EOF
test_begin_subtest "notmuch_database_{set,get}_config"
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
- RUN(notmuch_database_set_config (db, "testkey1", "testvalue1"));
- RUN(notmuch_database_set_config (db, "testkey2", "testvalue2"));
- RUN(notmuch_database_get_config (db, "testkey1", &val));
+ EXPECT0(notmuch_database_set_config (db, "testkey1", "testvalue1"));
+ EXPECT0(notmuch_database_set_config (db, "testkey2", "testvalue2"));
+ EXPECT0(notmuch_database_get_config (db, "testkey1", &val));
printf("testkey1 = %s\n", val);
- RUN(notmuch_database_get_config (db, "testkey2", &val));
+ EXPECT0(notmuch_database_get_config (db, "testkey2", &val));
printf("testkey2 = %s\n", val);
}
EOF
@@ -60,7 +49,7 @@ test_begin_subtest "notmuch_database_get_config_list: empty list"
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
notmuch_config_list_t *list;
- RUN(notmuch_database_get_config_list (db, "nonexistent", &list));
+ EXPECT0(notmuch_database_get_config_list (db, "nonexistent", &list));
printf("valid = %d\n", notmuch_config_list_valid (list));
notmuch_config_list_destroy (list);
}
@@ -77,9 +66,9 @@ test_begin_subtest "notmuch_database_get_config_list: all pairs"
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
notmuch_config_list_t *list;
- RUN(notmuch_database_set_config (db, "zzzafter", "afterval"));
- RUN(notmuch_database_set_config (db, "aaabefore", "beforeval"));
- RUN(notmuch_database_get_config_list (db, "", &list));
+ EXPECT0(notmuch_database_set_config (db, "zzzafter", "afterval"));
+ EXPECT0(notmuch_database_set_config (db, "aaabefore", "beforeval"));
+ EXPECT0(notmuch_database_get_config_list (db, "", &list));
for (; notmuch_config_list_valid (list); notmuch_config_list_move_to_next (list)) {
printf("%s %s\n", notmuch_config_list_key (list), notmuch_config_list_value(list));
}
@@ -100,7 +89,7 @@ test_begin_subtest "notmuch_database_get_config_list: one prefix"
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
notmuch_config_list_t *list;
- RUN(notmuch_database_get_config_list (db, "testkey", &list));
+ EXPECT0(notmuch_database_get_config_list (db, "testkey", &list));
for (; notmuch_config_list_valid (list); notmuch_config_list_move_to_next (list)) {
printf("%s %s\n", notmuch_config_list_key (list), notmuch_config_list_value(list));
}
@@ -118,7 +107,7 @@ test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "dump config"
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
- RUN(notmuch_database_set_config (db, "key with spaces", "value, with, spaces!"));
+ EXPECT0(notmuch_database_set_config (db, "key with spaces", "value, with, spaces!"));
}
EOF
notmuch dump --include=config >OUTPUT
@@ -136,7 +125,7 @@ test_begin_subtest "restore config"
notmuch dump --include=config >EXPECTED
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
- RUN(notmuch_database_set_config (db, "testkey1", "mutatedvalue"));
+ EXPECT0(notmuch_database_set_config (db, "testkey1", "mutatedvalue"));
}
EOF
notmuch restore --include=config <EXPECTED
diff --git a/test/notmuch-test.h b/test/notmuch-test.h
new file mode 100644
index 0000000..e6e1d6c
--- /dev/null
+++ b/test/notmuch-test.h
@@ -0,0 +1,15 @@
+#ifndef _NOTMUCH_TEST_H
+#define _NOTMUCH_TEST_H
+#include <stdio.h>
+#include <notmuch.h>
+
+void expect0(int line, notmuch_status_t ret)
+{
+ if (ret) {
+ fprintf (stderr, "line %d: %s\n", line, ret);
+ exit (1);
+ }
+}
+
+#define EXPECT0(v) expect0(__LINE__, v);
+#endif
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 201d0eb..442d293 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -1199,7 +1199,7 @@ test_C () {
test_file="${exec_file}.c"
cat > ${test_file}
export LD_LIBRARY_PATH=${TEST_DIRECTORY}/../lib
- ${TEST_CC} ${TEST_CFLAGS} -I${TEST_DIRECTORY}/../lib -o ${exec_file} ${test_file} -L${TEST_DIRECTORY}/../lib/ -lnotmuch -ltalloc
+ ${TEST_CC} ${TEST_CFLAGS} -I${TEST_DIRECTORY} -I${TEST_DIRECTORY}/../lib -o ${exec_file} ${test_file} -L${TEST_DIRECTORY}/../lib/ -lnotmuch -ltalloc
echo "== stdout ==" > OUTPUT.stdout
echo "== stderr ==" > OUTPUT.stderr
./${exec_file} "$@" 1>>OUTPUT.stdout 2>>OUTPUT.stderr
--
2.8.1
next prev parent reply other threads:[~2016-06-04 12:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-03 15:09 [PATCH] Use the Xapian::DB_RETRY_LOCK flag when available Istvan Marko
2016-05-03 16:31 ` Jani Nikula
2016-05-03 19:12 ` [PATCH v2] " Istvan Marko
2016-05-05 10:33 ` David Bremner
2016-06-04 12:29 ` v3 of DB_RETRY_LOCK David Bremner
2016-06-04 12:29 ` [PATCH 1/4] Use the Xapian::DB_RETRY_LOCK flag when available David Bremner
2016-06-04 12:29 ` David Bremner [this message]
2016-06-04 12:37 ` [PATCH] fixup! test: factor out some boilerplate from C tests David Bremner
2016-06-14 0:57 ` [PATCH 2/4] " David Bremner
2016-06-04 12:29 ` [PATCH 3/4] test: initial tests for locking retry David Bremner
2016-06-04 12:29 ` [PATCH 4/4] lib: add built_with handling for XAPIAN_DB_RETRY_LOCK David Bremner
2016-06-04 12:38 ` [PATCH] fixup! " David Bremner
2016-05-03 19:01 ` [PATCH] Use the Xapian::DB_RETRY_LOCK flag when available David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465043356-23420-3-git-send-email-david@tethera.net \
--to=david@tethera.net \
--cc=jani@nikula.org \
--cc=notmuch@kismala.com \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).