diff options
| author |   Angelo Mantellini <manangel@cisco.com> | 2019-02-14 11:15:08 +0100 |
|---|---|---|
| committer | Angelo Mantellini <manangel@cisco.com> | 2019-02-14 13:07:39 +0100 |
| commit | b95da59966d1c39b2be874222a265fbdc9c190ef (patch) | |
| tree | 4176d184a5ed0ab0f0bfe364a3c87e662ac6f3c3 /libccnx-transport-rta | |
| parent | 04dd447681b20fa087554708b2672f4f5bd1dea0 (diff) | |
[HICN-63] ccnx-common broken build because of tests
Change-Id: I9ee68c28b121abaca7916b1edc8508e58c9fa299
Signed-off-by: Angelo Mantellini <manangel@cisco.com>
Diffstat (limited to 'libccnx-transport-rta')
3 files changed, 8 insertions, 10 deletions
diff --git a/libccnx-transport-rta/ccnx/transport/common/test/CMakeLists.txt b/libccnx-transport-rta/ccnx/transport/common/test/CMakeLists.txt index c964fc69..beed2f04 100644 --- a/libccnx-transport-rta/ccnx/transport/common/test/CMakeLists.txt +++ b/libccnx-transport-rta/ccnx/transport/common/test/CMakeLists.txt @@ -3,10 +3,6 @@ add_definitions(--coverage) set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} " --coverage") set(TestsExpectedToPass - test_transport_MetaMessage - test_ccnx_ConnectionConfig - test_ccnx_StackConfig - test_ccnx_TransportConfig ) diff --git a/libccnx-transport-rta/ccnx/transport/transport_rta/commands/test/CMakeLists.txt b/libccnx-transport-rta/ccnx/transport/transport_rta/commands/test/CMakeLists.txt index d3a5f009..47386293 100644 --- a/libccnx-transport-rta/ccnx/transport/transport_rta/commands/test/CMakeLists.txt +++ b/libccnx-transport-rta/ccnx/transport/transport_rta/commands/test/CMakeLists.txt @@ -3,8 +3,7 @@ add_definitions(--coverage) set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} " --coverage") set(TestsExpectedToPass - test_rta_Command - test_rta_CommandCreateProtocolStack + test_rta_Command test_rta_CommandOpenConnection test_rta_CommandCloseConnection test_rta_CommandDestroyProtocolStack diff --git a/libccnx-transport-rta/scripts/build-package.sh b/libccnx-transport-rta/scripts/build-package.sh index d664b91d..b64df8e8 100644 --- a/libccnx-transport-rta/scripts/build-package.sh +++ b/libccnx-transport-rta/scripts/build-package.sh @@ -36,7 +36,7 @@ update_cmake_repo() { update_qt_repo() { DISTRIBUTION_CODENAME=$1 - if [ "$DISTRIBUTION_CODENAME" != "trusty" ] && [ "$DISTRIBUTION_CODENAME" != "xenial" ]; then + if [ "$DISTRIBUTION_CODENAME" != "trusty" ] && [ "$DISTRIBUTION_CODENAME" != "xenial" ] && [ "$DISTRIBUTION_CODENAME" != "bionic" ]; then echo "No valid distribution specified when calling 'update_qt_repo'. Exiting.." exit -1 fi @@ -68,18 +68,21 @@ update_fdio_repo() { REPO_VPP_URL="${NEXUS_PROXY}/content/repositories/fd.io.stable.1701.ubuntu.xenial.main/" REPO=${REPO_NAME:-"master.ubuntu.xenial.main"} REPO_CICN_URL="${NEXUS_PROXY}/content/repositories/fd.io.${REPO}" + echo "deb ${REPO_VPP_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.list + echo "deb ${REPO_CICN_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.master.list elif [ "$DISTRIB_CODENAME" == "trusty" ]; then REPO_VPP_URL="${NEXUS_PROXY}/content/repositories/fd.io.stable.1701.ubuntu.trusty.main/" REPO=${REPO_NAME:-"master.ubuntu.trusty.main"} REPO_CICN_URL="${NEXUS_PROXY}/content/repositories/fd.io.${REPO}" + echo "deb ${REPO_VPP_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.list + echo "deb ${REPO_CICN_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.master.list + elif [ "$DISTRIB_CODENAME" == "bionic" ]; then + curl -s https://packagecloud.io/install/repositories/fdio/release/script.deb.sh | sudo bash else echo "Distribution $DISTRIB_CODENAME is not supported" exit -1 fi - echo "deb ${REPO_VPP_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.list - echo "deb ${REPO_CICN_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.master.list - elif [ "$DISTRIB_ID" == "CentOS" ]; then REPO_VPP_URL="${NEXUS_PROXY}/content/repositories/fd.io.centos7/" REPO=${REPO_NAME:-"master.centos7"} |