Discussion:
[PATCH 0/2] Enable travis-ci test.
Gris Ge
2015-07-13 15:00:49 UTC
Permalink
* Patch 1/2 is to allow 'make distcheck' to run without libmicrohttpd.

The travis-ci.org is using Ubuntu 12.04 which is shipping old libmicrohttpd.

Gris Ge (2):
Automake: Fix incorrect use of DISTCHECK_CONFIGURE_FLAGS.
Enabled travis-ci.org support.

.travis.yml | 19 +++++++++++++++++++
Makefile.am | 5 +++--
2 files changed, 22 insertions(+), 2 deletions(-)
create mode 100644 .travis.yml
--
2.1.4
Gris Ge
2015-07-13 15:00:51 UTC
Permalink
Signed-off-by: Gris Ge <***@redhat.com>
---
.travis.yml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..8fe5bf3
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,19 @@
+sudo: true
+# python-pywbem and libconfig-dev is not in whitelist yet which stop us using
+# "sudo : false" new container way:
+# https://github.com/travis-ci/travis-ci/issues/4332
+# https://github.com/travis-ci/travis-ci/issues/4329
+
+language: c
+
+install:
+ - sudo apt-get update -qq
+ - sudo apt-get install -qq gcc tar make g++ libtool autoconf automake
+ libyajl-dev python-pywbem libxml2-dev check
+ libglib2.0-dev python-m2crypto libssl-dev libconfig-dev
+
+
+compiler: gcc
+
+script: ./autogen.sh && ./configure --without-rest-api &&
+ env DISTCHECK_CONFIGURE_FLAGS="--without-rest-api" make distcheck
--
2.1.4
Gris Ge
2015-07-13 15:00:50 UTC
Permalink
According to GNU manual[1], in Makefile, we should use AM_DISTCHECK_CONFIGURE_FLAGS
variable instead of DISTCHECK_CONFIGURE_FLAGS.

The DISTCHECK_CONFIGURE_FLAGS is for user to use in command line.

[1]: http://www.gnu.org/software/automake/manual/html_node/Checking-the-Distribution.html

Signed-off-by: Gris Ge <***@redhat.com>
---
Makefile.am | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5c2f4ed..2393c33 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,9 @@

ACLOCAL_AMFLAGS = -I m4

-DISTCHECK_CONFIGURE_FLAGS = --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
-DISTCHECK_CONFIGURE_FLAGS += \
+AM_DISTCHECK_CONFIGURE_FLAGS = \
+ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+AM_DISTCHECK_CONFIGURE_FLAGS += \
--with-bash-completion-dir=$$dc_install_base/$(bashcompletiondir)

SUBDIRS= c_binding python_binding plugin doc tools daemon packaging config
--
2.1.4
Loading...