espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-03 01:17:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

travis: Update travis to do a make distcheck instead of just make check (#46)

Browse Source 
* travis: Do a `make distcheck` instead of just `make check`

Doing a `make distcheck` instead of just a `make check` ensures that
the build system is sane and that the results from `make dist` have
everything needed.

* build-system: Fixes for `make distcheck`

This commit fixes the `distcheck` target by addressing the following
issues:

 *  Repaired ability to perform builds when the build directory is not
    the source directory.
 *  Addressed an issue with the tarball name that occurs the very
    first time `make` is run.
This commit is contained in:
Robert Quattlebaum
2016-05-19 13:34:40 -07:00
committed by Jonathan Hui
parent f68de0f388
commit 059763bfcc
7 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -5,4 +5,4 @@ before_install:
script:
- ./bootstrap-configure --enable-minimum-set-of-tests
- make check
- make distcheck
Makefile.am
+10
View File
@@ -30,6 +30,8 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
AM_MAKEFLAGS = --no-print-directory
AM_DISTCHECK_CONFIGURE_FLAGS = --enable-minimum-set-of-tests
SUBDIRS = \
include \
src \
@@ -91,6 +93,14 @@ OPENTHREAD_VERSION ?= $(shell cat $(VERSION_FILE) 2> /dev/null)
PACKAGE_VERSION = $(OPENTHREAD_VERSION)
VERSION = $(PACKAGE_VERSION)
distdir = $(PACKAGE)-$(shell \
if [ "$(origin OPENTHREAD_VERSION)" != "file" ]; then \
echo "$(OPENTHREAD_VERSION)" ; \
else \
$(abs_top_nlbuild_autotools_dir)/scripts/mkversion \
-b "$(OPENTHREAD_VERSION)" "$(top_srcdir)"; \
fi )
#
# check-file-.local-version
#
doc/Doxyfile.in
+1 -1
View File
@@ -1116,7 +1116,7 @@ HTML_FILE_EXTENSION = .html
# of the possible markers and block names see the documentation.
# This tag requires that the tag GENERATE_HTML is set to YES.
HTML_HEADER = header.html
HTML_HEADER = @abs_srcdir@/header.html
# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
# generated HTML page. If the tag is left blank doxygen will generate a standard
examples/cli/Makefile.am
+6 -6
View File
@@ -39,12 +39,12 @@ soc_CPPFLAGS = \
$(OPENTHREAD_TARGET_DEFINES) \
$(NULL)
soc_LDADD = \
$(top_srcdir)/src/core/libopenthread.a \
$(top_srcdir)/src/cli/libopenthread-cli.a \
$(top_srcdir)/examples/platform/posix/libopenthread-posix.a \
$(top_srcdir)/third_party/mbedtls/libmbedcrypto.a \
-lpthread \
soc_LDADD = \
$(top_builddir)/src/core/libopenthread.a \
$(top_builddir)/src/cli/libopenthread-cli.a \
$(top_builddir)/examples/platform/posix/libopenthread-posix.a \
$(top_builddir)/third_party/mbedtls/libmbedcrypto.a \
-lpthread \
$(NULL)
soc_SOURCES = \
tests/scripts/Makefile.am
+1 -1
View File
@@ -192,7 +192,7 @@ endif # OPENTHREAD_WITH_ESSENTIAL_TESTS_ONLY
TESTS_ENVIRONMENT = \
export \
top_srcdir='$(top_srcdir)' \
top_builddir='$(top_builddir)' \
VERBOSE=1; \
$(NULL)
tests/scripts/thread-cert/node.py
+2 -2
View File
@@ -52,8 +52,8 @@ class Node:
def __init_sim(self, nodeid):
""" Initialize a simulation node. """
if "top_srcdir" in os.environ.keys():
srcdir = os.environ['top_srcdir']
if "top_builddir" in os.environ.keys():
srcdir = os.environ['top_builddir']
cmd = '%s/examples/cli/soc' % srcdir
else:
cmd = './soc'
tests/unit/Makefile.am
+5 -5
View File
@@ -53,11 +53,11 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/third_party/mbedtls/repo/include \
$(NULL)
COMMON_LDADD = \
$(top_srcdir)/src/core/libopenthread.a \
$(top_srcdir)/examples/platform/posix/libopenthread-posix.a \
$(top_srcdir)/third_party/mbedtls/libmbedcrypto.a \
-lpthread \
COMMON_LDADD = \
$(top_builddir)/src/core/libopenthread.a \
$(top_builddir)/examples/platform/posix/libopenthread-posix.a \
$(top_builddir)/third_party/mbedtls/libmbedcrypto.a \
-lpthread \
$(NULL)
# Test applications that should be run when the 'check' target is run.