aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Krysik <ptrkrysik@gmail.com>2021-05-03 11:30:29 +0200
committerPiotr Krysik <ptrkrysik@gmail.com>2021-05-03 12:05:49 +0200
commit92e4032d6da142de3b8f9d90f9d09a53a763a8aa (patch)
tree5be2484c705038a1ac27c1460d818d379a26c346
parent6e602f5b7cad21efb8e3d8ea50eced24469bcf88 (diff)
tests: Remove test that don't work
-rw-r--r--.travis.yml8
-rw-r--r--tests/dockerfiles/CentOS_7.Dockerfile32
-rw-r--r--tests/dockerfiles/CentOS_7_pygtk2.patch30
-rw-r--r--tests/dockerfiles/Debian_testing.docker8
-rw-r--r--tests/dockerfiles/Debian_testing_package.docker10
-rw-r--r--tests/dockerfiles/Fedora_26.Dockerfile28
-rw-r--r--tests/dockerfiles/Kali.docker32
-rw-r--r--tests/dockerfiles/Ubuntu_16_04.docker32
-rw-r--r--tests/dockerfiles/Ubuntu_16_04_nolibosmo.docker31
-rw-r--r--tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker51
10 files changed, 5 insertions, 257 deletions
diff --git a/.travis.yml b/.travis.yml
index 437e66e..5dcec4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,13 +4,7 @@ dist: bionic
language: ruby
env:
- - DOCKERFILE=tests/dockerfiles/Debian_testing.docker IMGNAME=debtest-grgsm
-# - DOCKERFILE=tests/dockerfiles/Ubuntu_16_04.docker IMGNAME=ubu16.04-grgsm
-# - DOCKERFILE=tests/dockerfiles/Ubuntu_16_04_nolibosmo.docker IMGNAME=ubu16.04-grgsm-nolibosmo
- - DOCKERFILE=tests/dockerfiles/Kali.docker IMGNAME=kali-grgsm
-# - DOCKERFILE=tests/dockerfiles/Fedora_26.Dockerfile IMGNAME=fedora26-grgsm
- - DOCKERFILE=tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker IMGNAME=ubuntu_18_04_gnuradio_ppa
-
+ - DOCKERFILE=tests/dockerfiles/Debian_testing.docker IMGNAME=debian_testing
services:
- docker
diff --git a/tests/dockerfiles/CentOS_7.Dockerfile b/tests/dockerfiles/CentOS_7.Dockerfile
deleted file mode 100644
index b5c235d..0000000
--- a/tests/dockerfiles/CentOS_7.Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM centos:7
-
-RUN yum install -y \
- https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
- yum install -y \
- gcc-c++ \
- make \
- cmake3 \
- pkgconfig \
- boost-devel \
- gnuradio-devel \
- libosmocore-devel \
- gr-osmosdr \
- swig \
- doxygen \
- python2-docutils \
- cppunit-devel
-
-COPY ./ /src/
-
-RUN yum install -y patch && \
- patch -p0 < /src/tests/dockerfiles/CentOS_7_pygtk2.patch
-
-WORKDIR /src/build
-RUN cmake3 -DENABLE_GRGSM_LIVEMON=OFF .. && \
- # The parallel build sometimes fails when the .grc_gnuradio
- # and .gnuradio directories do not exist
- mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \
- make -j $(nproc) && \
- make install && \
- ldconfig && \
- make test
diff --git a/tests/dockerfiles/CentOS_7_pygtk2.patch b/tests/dockerfiles/CentOS_7_pygtk2.patch
deleted file mode 100644
index a5ed29c..0000000
--- a/tests/dockerfiles/CentOS_7_pygtk2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- /usr/lib64/python2.7/site-packages/gtk-2.0/gtk/__init__.py 2018-04-23 17:29:19.555209060 +0000
-+++ /usr/lib64/python2.7/site-packages/gtk-2.0/gtk/__init__.py 2018-04-23 17:32:53.448304174 +0000
-@@ -47,14 +47,19 @@
- def _init():
- import sys
-
-- sys_path = sys.path[:]
-+ try:
-+ sys_path = sys.path[:]
-
-- _gtk.init_check()
--
-- # init_check calls PySys_SetArgv which calls sys.path.insert(0, ''),
-- # which causes problems for pychecker, restore it if modified.
-- if sys.path != sys_path:
-- sys.path[:] = sys_path
-+ try:
-+ _gtk.init_check()
-+ except RuntimeError, e:
-+ import warnings
-+ warnings.warn(str(e), _gtk.Warning)
-+ finally:
-+ # init_check calls PySys_SetArgv which calls sys.path.insert(0, ''),
-+ # which causes problems for pychecker, restore it if modified.
-+ if sys.path != sys_path:
-+ sys.path[:] = sys_path
-
- # install the default log handlers
- _gtk.add_log_handlers()
-
diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker
index c4c3057..8a9f84b 100644
--- a/tests/dockerfiles/Debian_testing.docker
+++ b/tests/dockerfiles/Debian_testing.docker
@@ -13,16 +13,16 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
liblog4cpp5-dev \
python3-docutils \
python3-scipy \
- gnuradio-dev gnuradio libgmp-dev libboost-regex-dev liborc-dev \
+ gnuradio-dev \
+ liborc-dev \
libosmocore-dev \
gr-osmosdr
COPY ./ /src/
-
-RUN mkdir -p /src/build
+RUN mkdir /src/build
WORKDIR /src/build
-RUN PYTHONPATH=/usr/local/lib/python3/dist-packages/:$PYTHONPATH cmake .. && \
+RUN cmake .. && \
# The parallel build sometimes fails when the .grc_gnuradio
# and .gnuradio directories do not exist
mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \
diff --git a/tests/dockerfiles/Debian_testing_package.docker b/tests/dockerfiles/Debian_testing_package.docker
deleted file mode 100644
index 35d31cd..0000000
--- a/tests/dockerfiles/Debian_testing_package.docker
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM debian:testing
-MAINTAINER Piotr Krysik
-
-RUN apt-get update && apt-get install -y \
- gr-gsm
-
-COPY ./ /src/
-RUN ls /src
-
-
diff --git a/tests/dockerfiles/Fedora_26.Dockerfile b/tests/dockerfiles/Fedora_26.Dockerfile
deleted file mode 100644
index 38a5a52..0000000
--- a/tests/dockerfiles/Fedora_26.Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM fedora:26
-
-RUN dnf install -y \
- gcc-c++ \
- make \
- cmake \
- pkgconfig \
- boost-devel \
- gnuradio-devel \
- libosmocore-devel \
- gr-osmosdr \
- swig \
- doxygen \
- python2-docutils \
- cppunit-devel
-
-COPY ./ /src/
-
-WORKDIR /src/build
-RUN cmake .. && \
- # The parallel build sometimes fails when the .grc_gnuradio
- # and .gnuradio directories do not exist
- mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \
- make && \
- make -j $(nproc) && \
- make install && \
- ldconfig && \
- make CTEST_OUTPUT_ON_FAILURE=1 test
diff --git a/tests/dockerfiles/Kali.docker b/tests/dockerfiles/Kali.docker
deleted file mode 100644
index a953ece..0000000
--- a/tests/dockerfiles/Kali.docker
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM kalilinux/kali-linux-docker
-MAINTAINER Piotr Krysik
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- cmake \
- autoconf \
- libtool \
- pkg-config \
- build-essential \
- libcppunit-dev \
- swig \
- doxygen \
- liblog4cpp5-dev \
- python3-docutils \
- python3-scipy \
- gnuradio-dev gnuradio libgmp-dev libboost-regex-dev liborc-dev \
- libosmocore-dev \
- gr-osmosdr
-
-COPY ./ /src/
-
-RUN mkdir -p /src/build
-WORKDIR /src/build
-
-RUN PYTHONPATH=/usr/local/lib/python3/dist-packages/:$PYTHONPATH cmake .. && \
- # The parallel build sometimes fails when the .grc_gnuradio
- # and .gnuradio directories do not exist
- mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \
- make -j $(nproc) && \
- make install && \
- ldconfig && \
- make CTEST_OUTPUT_ON_FAILURE=1 test
diff --git a/tests/dockerfiles/Ubuntu_16_04.docker b/tests/dockerfiles/Ubuntu_16_04.docker
deleted file mode 100644
index fe1c35f..0000000
--- a/tests/dockerfiles/Ubuntu_16_04.docker
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM ubuntu:16.04
-MAINTAINER Piotr Krysik
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- cmake \
- autoconf \
- libtool \
- pkg-config \
- build-essential \
- python-docutils \
- libcppunit-dev \
- swig \
- doxygen \
- liblog4cpp5-dev \
- python-scipy \
- gnuradio-dev \
- gr-osmosdr \
- libosmocore-dev
-
-COPY ./ /src/
-RUN ls /src
-
-RUN mkdir /src/build
-WORKDIR /src/build
-RUN cmake .. && \
- # The parallel build sometimes fails when the .grc_gnuradio
- # and .gnuradio directories do not exist
- mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \
- make -j $(nproc) && \
- make install && \
- ldconfig && \
- make CTEST_OUTPUT_ON_FAILURE=1 test
diff --git a/tests/dockerfiles/Ubuntu_16_04_nolibosmo.docker b/tests/dockerfiles/Ubuntu_16_04_nolibosmo.docker
deleted file mode 100644
index ba70afd..0000000
--- a/tests/dockerfiles/Ubuntu_16_04_nolibosmo.docker
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM ubuntu:16.04
-MAINTAINER Piotr Krysik
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- cmake \
- autoconf \
- libtool \
- pkg-config \
- build-essential \
- python-docutils \
- libcppunit-dev \
- swig \
- doxygen \
- liblog4cpp5-dev \
- python-scipy \
- gnuradio-dev \
- gr-osmosdr
-
-COPY ./ /src/
-RUN ls /src
-
-RUN mkdir /src/build
-WORKDIR /src/build
-RUN cmake .. && \
- # The parallel build sometimes fails when the .grc_gnuradio
- # and .gnuradio directories do not exist
- mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \
- make -j $(nproc) && \
- make install && \
- ldconfig && \
- make CTEST_OUTPUT_ON_FAILURE=1 test
diff --git a/tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker b/tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker
deleted file mode 100644
index e0f45a5..0000000
--- a/tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker
+++ /dev/null
@@ -1,51 +0,0 @@
-FROM ubuntu:18.04
-MAINTAINER Vasil Velichkov
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- software-properties-common && \
- add-apt-repository --yes ppa:gnuradio/gnuradio-releases && \
- DEBIAN_FRONTEND=noninteractive apt-get install -y \
- git \
- cmake \
- autoconf \
- libtool \
- pkg-config \
- build-essential \
- python-docutils \
- libcppunit-dev \
- swig \
- doxygen \
- liblog4cpp5-dev \
- python-scipy \
- gnuradio-dev gnuradio libgmp-dev libboost-regex-dev liborc-dev libuhd-dev \
- libosmocore-dev
-
-RUN git clone --branch maint-3.8 --recurse-submodules https://github.com/velichkov/gr-iqbal && \
- cd gr-iqbal && \
- mkdir build && \
- cd build && \
- cmake -DENABLE_DOXYGEN=OFF .. && \
- make -j $(nproc) install
-
-RUN git clone --branch maint-3.8 https://github.com/velichkov/gr-osmosdr && \
- cd gr-osmosdr && \
- mkdir build && \
- cd build && \
- cmake -DENABLE_DOXYGEN=OFF .. && \
- make -j $(nproc) install
-
-COPY ./ /src/
-RUN mkdir /src/build
-WORKDIR /src/build
-
-#PYTHONPATH is needed as gr-osmosdr gets installed in /usr/local/lib/python3/...
-ENV PYTHONPATH=/usr/local/lib/python3/dist-packages/:$PYTHONPATH
-
-RUN cmake .. && \
- # The parallel build sometimes fails when the .grc_gnuradio
- # and .gnuradio directories do not exist
- mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \
- make -j $(nproc) && \
- make install && \
- ldconfig && \
- make CTEST_OUTPUT_ON_FAILURE=1 test