From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: Mikhail <mp39590@gmail.com>
Subject: [PATCH] tests: add compatibility layer
Date: Thu, 9 Mar 2017 09:32:43 -0400 [thread overview]
Message-ID: <20170309133243.1849-1-david@tethera.net> (raw)
From: Mikhail <mp39590@gmail.com>
Make test-lib-common.sh load test-lib-<$PLATFORM>.sh to create
additional shim for platform specifics.
Use test-lib-FREEBSD.sh to call GNU utilities instead of native ones.
- amended by db following Tomi's suggestions
---
I haven't tested this, except to verify it doesn't crash under GNU/Linux
configure | 3 +++
test/README | 11 +++++++++++
test/test-lib-FREEBSD.sh | 9 +++++++++
test/test-lib-common.sh | 5 +++++
4 files changed, 28 insertions(+)
create mode 100644 test/test-lib-FREEBSD.sh
diff --git a/configure b/configure
index fa77eb8f..eb452a12 100755
--- a/configure
+++ b/configure
@@ -1186,6 +1186,9 @@ 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}
+
+# Platform we are run on
+PLATFORM=${platform}
EOF
# Finally, after everything configured, inform the user how to continue.
diff --git a/test/README b/test/README
index 104a120e..ae22d6e0 100644
--- a/test/README
+++ b/test/README
@@ -33,6 +33,17 @@ chosen directory to your PATH before running the tests.
e.g. env PATH=/opt/gnu/bin:$PATH make test
+For FreeBSD you need to install latest gdb from ports or packages and
+provide path to it in TEST_GDB environment variable before executing
+the tests, native FreeBSD gdb does not not work. If you install
+coreutils, which provides GNU versions of basic utils like 'date' and
+'base64' on FreeBSD, the test suite will use these instead of the
+native ones. This provides robustness against portability issues with
+these system tools. Most often the tests are written, reviewed and
+tested on Linux system so such portability issues arise from time to
+time.
+
+
Running Tests
-------------
The easiest way to run tests is to say "make test", (or simply run the
diff --git a/test/test-lib-FREEBSD.sh b/test/test-lib-FREEBSD.sh
new file mode 100644
index 00000000..d1840b56
--- /dev/null
+++ b/test/test-lib-FREEBSD.sh
@@ -0,0 +1,9 @@
+# If present, use GNU Coreutils instead of a native BSD utils
+if command -v gdate >/dev/null
+ then
+ date () { gdate "$@"; }
+ base64 () { gbase64 "$@"; }
+ wc () { gwc "$@"; }
+ sed () { gsed "$@"; }
+ sha256sum () { gsha256sum "$@"; }
+ fi
diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh
index a96cfbeb..ef409171 100644
--- a/test/test-lib-common.sh
+++ b/test/test-lib-common.sh
@@ -66,6 +66,11 @@ export LD_LIBRARY_PATH
# configure output
. $notmuch_path/sh.config || exit 1
+# load OS specifics
+if [ -e ./test-lib-$PLATFORM.sh ]; then
+ . ./test-lib-$PLATFORM.sh || exit 1
+fi
+
if test -n "$valgrind"
then
make_symlink () {
--
2.11.0
next reply other threads:[~2017-03-09 14:02 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-09 13:32 David Bremner [this message]
2017-03-09 15:47 ` [PATCH] tests: add compatibility layer Tomi Ollila
2017-03-24 20:33 ` Mikhail
2017-03-25 11:10 ` David Bremner
-- strict thread matches above, loose matches on Subject: below --
2016-12-20 19:47 mp39590
2016-12-20 22:24 ` David Bremner
2016-12-21 5:12 ` Tomi Ollila
2016-12-21 14:56 ` Mikhail
2016-12-22 9:31 ` mp39590
2016-12-31 11:03 ` David Bremner
2017-01-02 13:57 ` mp39590
2017-01-03 15:48 ` Tomi Ollila
2017-01-03 15:52 ` Tomi Ollila
2017-01-03 17:21 ` Tomi Ollila
2017-01-04 1:57 ` Mikhail
2016-12-31 15:17 ` Tomi Ollila
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=20170309133243.1849-1-david@tethera.net \
--to=david@tethera.net \
--cc=mp39590@gmail.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).