[Pkg-privacy-commits] [libotr] 20/20: Only build the test suite on Linux

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to annotated tag 4.1.1
in repository libotr.

commit d8bc5628bb69e541d6d19d2863ba5b31e899f75e
Author: Ian Goldberg <iang at cs.uwaterloo.ca>
Date:   Mon Mar 7 08:53:39 2016 -0500

    Only build the test suite on Linux
    
    The test suite currently uses Linux-specific features such as epoll.
    
    Signed-off-by: David Goulet <dgoulet at ev0ke.net>
    Signed-off-by: Ian Goldberg <iang at cs.uwaterloo.ca>
---
 ChangeLog    |  4 ++++
 Makefile.am  |  5 ++++-
 NEWS         |  3 ++-
 configure.ac | 11 +++++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4780a8e..35752b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 	* tests/regression/client/Makefile.am:
 	* tests/unit/Makefile.am: Add LIBGCRYPT_CFLAGS to the test suite
 
+	* Makefile.am:
+	* configure.ac: Only build the test suite on Linux, since it
+	currently uses Linux-specific features such as epoll
+
 2016-03-06
 
 	* Makefile.am: Add bootstrap to the tarball
diff --git a/Makefile.am b/Makefile.am
index 9a2e7ca..0508e67 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,9 @@
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = src toolkit tests
+SUBDIRS = src toolkit
+if BUILD_TESTS
+SUBDIRS += tests
+endif
 
 EXTRA_DIST = Protocol-v3.html UPGRADING packaging libotr.m4 libotr.pc.in bootstrap
 
diff --git a/NEWS b/NEWS
index dc7ab9d..1be7466 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,8 @@
   from there remote code execution) on 64-bit platforms
 - Fix possible free() of an uninitialized pointer
 - Be stricter about parsing v3 fragments
-- Add a testsuite ("make check" to run it)
+- Add a testsuite ("make check" to run it), but only on Linux for now,
+  since it uses Linux-specific features such as epoll
 - Fix a memory leak when reading a malformed instance tag file
 - Protocol documentation clarifications
 
diff --git a/configure.ac b/configure.ac
index 9c93143..d8c857d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,17 @@ LT_INIT
 
 AM_PATH_LIBGCRYPT(1:1.2.0,,AC_MSG_ERROR(libgcrypt 1.2.0 or newer is required.))
 
+AC_CANONICAL_HOST
+# Identify which OS we are building and do specific things based on the host
+case $host_os in
+  *linux*)
+    HOST_OS=linux
+    ;;
+esac
+
+# Build tests for now only for Linux.
+AM_CONDITIONAL([BUILD_TESTS], [test x$HOST_OS = xlinux])
+
 dnl 1:flags
 dnl Taken from Tor's autoconf magic repository
 AC_DEFUN([OTR_CHECK_CFLAGS], [

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/libotr.git