Use Jessie instead of Ubuntu Dockerfile for GCC-4.8 tests

pull/8613/head
Matt Kwong 8 years ago
parent ea14e0e2a0
commit 1347e40563
  1. 4
      templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template
  2. 4
      templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template
  3. 4
      tools/dockerfile/test/cxx_jessie_x64/Dockerfile
  4. 4
      tools/dockerfile/test/cxx_jessie_x86/Dockerfile
  5. 2
      tools/run_tests/run_tests.py

@ -37,5 +37,9 @@
<%include file="../../clang_update.include"/> <%include file="../../clang_update.include"/>
<%include file="../../run_tests_addons.include"/> <%include file="../../run_tests_addons.include"/>
<%include file="../../libuv_install.include"/> <%include file="../../libuv_install.include"/>
# Install gcc-4.8 and other relevant items
RUN apt-get update && apt-get -y install gcc-4.8 gcc-4.8-multilib g++-4.8 g++-4.8-multilib && apt-get clean
# Define the default command. # Define the default command.
CMD ["bash"] CMD ["bash"]

@ -35,5 +35,9 @@
<%include file="../../python_deps.include"/> <%include file="../../python_deps.include"/>
<%include file="../../cxx_deps.include"/> <%include file="../../cxx_deps.include"/>
<%include file="../../run_tests_addons.include"/> <%include file="../../run_tests_addons.include"/>
# Install gcc-4.8 and other relevant items
RUN apt-get update && apt-get -y install gcc-4.8 gcc-4.8-multilib g++-4.8 g++-4.8-multilib && apt-get clean
# Define the default command. # Define the default command.
CMD ["bash"] CMD ["bash"]

@ -129,5 +129,9 @@ RUN mkdir /var/local/jenkins
#================ #================
# libuv # libuv
RUN cd /tmp && wget http://dist.libuv.org/dist/v1.9.1/libuv-v1.9.1.tar.gz && tar -xf libuv-v1.9.1.tar.gz && cd libuv-v1.9.1 && sh autogen.sh && ./configure --prefix=/usr && make && make install RUN cd /tmp && wget http://dist.libuv.org/dist/v1.9.1/libuv-v1.9.1.tar.gz && tar -xf libuv-v1.9.1.tar.gz && cd libuv-v1.9.1 && sh autogen.sh && ./configure --prefix=/usr && make && make install
# Install gcc-4.8 and other relevant items
RUN apt-get update && apt-get -y install gcc-4.8 gcc-4.8-multilib g++-4.8 g++-4.8-multilib && apt-get clean
# Define the default command. # Define the default command.
CMD ["bash"] CMD ["bash"]

@ -93,5 +93,9 @@ RUN ln -s /usr/bin/ccache /usr/local/bin/clang++
RUN mkdir /var/local/jenkins RUN mkdir /var/local/jenkins
# Install gcc-4.8 and other relevant items
RUN apt-get update && apt-get -y install gcc-4.8 gcc-4.8-multilib g++-4.8 g++-4.8-multilib && apt-get clean
# Define the default command. # Define the default command.
CMD ["bash"] CMD ["bash"]

@ -333,7 +333,7 @@ class CLanguage(object):
elif compiler == 'gcc4.6': elif compiler == 'gcc4.6':
return ('wheezy', self._gcc_make_options(version_suffix='-4.6')) return ('wheezy', self._gcc_make_options(version_suffix='-4.6'))
elif compiler == 'gcc4.8': elif compiler == 'gcc4.8':
return ('ubuntu1604', self._gcc_make_options(version_suffix='-4.8')) return ('jessie', self._gcc_make_options(version_suffix='-4.8'))
elif compiler == 'gcc5.3': elif compiler == 'gcc5.3':
return ('ubuntu1604', []) return ('ubuntu1604', [])
elif compiler == 'clang3.4': elif compiler == 'clang3.4':

Loading…
Cancel
Save