Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restyle Attempt to Reenable TestInet{EndPoint,LayerDNS} for CI #507

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
#
# Copyright (c) 2020 Project CHIP Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

#
# Description:
# This file is the Travis CI hosted, distributed continuous
# integration configuration file for the CHIP library.
#

language: minimal

branches:
Expand All @@ -7,6 +29,9 @@ branches:
services:
- docker

before_install:
- ./integrations/travis/before_install.sh

script:
- ./integrations/ci-tools/build.sh

Expand Down
55 changes: 55 additions & 0 deletions integrations/travis/before_install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
#!/bin/sh

#
# Copyright (c) 2020 Project CHIP Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

#
# Description:
# This file is the script for Travis CI hosted, distributed continuous
# integration 'before_install' trigger of the 'install' step.
#

die() {
echo " *** ERROR: " "${*}"
exit 1
}

# Package build machine OS-specific configuration and setup

case "$TRAVIS_OS_NAME" in

linux)
# By default, Travis CI does not have IPv6 enabled on
# Linux. Ensure that IPv6 is enabled since Weave, and its unit
# and functional tests, depend on working IPv6 support.

sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0

# If Docker is present, then enable IPv6 configuration.

if command -v docker; then
service docker stop

touch /etc/docker/daemon.json

echo '{ "ipv6" : true }' >/etc/docker/daemon.json

service docker start
fi

;;

esac
11 changes: 2 additions & 9 deletions src/inet/tests/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -95,19 +95,10 @@ COMMON_LDADD = \
# always be built to ensure overall "build sanity".
#
# These will NOT be part of the externally-consumable binary SDK.
#
# XXX - At this point TestInetEndPoint and TestInetLayerDNS are stranded
# here until a solution for enabling IPv6 on Linux containers for
# Docker on macOS can be resolved as that test involves
# executing APIs that exercise bind, listen, connect, accept,
# etc. on IPv4 and IPv6 IP end points. When that issue has been
# resolved, move these tests to check_PROGRAMS.

noinst_PROGRAMS = \
TestLwIPDNS \
TestInetEndPoint \
TestInetLayer \
TestInetLayerDNS \
TestInetLayerMulticast \
$(NULL)

Expand All @@ -116,7 +107,9 @@ noinst_PROGRAMS = \
check_PROGRAMS = \
TestInetAddress \
TestInetBuffer \
TestInetEndPoint \
TestInetErrorStr \
TestInetLayerDNS \
TestInetTimer \
$(NULL)

Expand Down