diff options
| author | Vasil Velichkov <vvvelichkov@gmail.com> | 2018-02-21 06:12:04 +0200 |
|---|---|---|
| committer | Piotr Krysik <ptrkrysik@users.noreply.github.com> | 2018-03-22 06:07:24 +0100 |
| commit | 0feb4ab51fcf73ebd71b05cd0309769615a7f0ba (patch) | |
| tree | 930b94732d7a6c2c62bfbeb6ba4ece4a1615c9fb /tests | |
| parent | 3f6ab15a7a5492391ca0f94bd0a5586c1735f8db (diff) | |
Fix the parallel build.
- Override the GR_UNIQUE_TARGET function to not append a hash to the
target name.
- Add explicit dependency between pygen_apps and _grgsm_swig
The _grgs_swig needs to be built first because grcc evaluates and
verify all imports
- Test the parallel build in the docker containers as well
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dockerfiles/Debian_testing.docker | 5 | ||||
| -rw-r--r-- | tests/dockerfiles/Kali.docker | 5 | ||||
| -rw-r--r-- | tests/dockerfiles/Ubuntu_16_04.docker | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker index 33ec8d1..a1010ed 100644 --- a/tests/dockerfiles/Debian_testing.docker +++ b/tests/dockerfiles/Debian_testing.docker @@ -23,7 +23,10 @@ RUN ls /src RUN mkdir /src/build WORKDIR /src/build RUN cmake .. && \ - make && \ + # 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/Kali.docker b/tests/dockerfiles/Kali.docker index 3cb3257..c844540 100644 --- a/tests/dockerfiles/Kali.docker +++ b/tests/dockerfiles/Kali.docker @@ -23,7 +23,10 @@ RUN ls /src RUN mkdir /src/build WORKDIR /src/build RUN cmake .. && \ - make && \ + # 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/Ubuntu_16_04.docker b/tests/dockerfiles/Ubuntu_16_04.docker index 28e01a6..21eafec 100644 --- a/tests/dockerfiles/Ubuntu_16_04.docker +++ b/tests/dockerfiles/Ubuntu_16_04.docker @@ -23,7 +23,10 @@ RUN ls /src RUN mkdir /src/build WORKDIR /src/build RUN cmake .. && \ - make && \ + # 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 |