From 4c878334ba1bd76c72cd17bc300a0fce255cdf19 Mon Sep 17 00:00:00 2001 From: Jerry Yu Date: Wed, 14 Jun 2023 13:25:25 +0800 Subject: [PATCH 1/2] Add faketime package This is prepare for checking data_files Signed-off-by: Jerry Yu --- resources/docker_files/ubuntu-16.04/Dockerfile | 2 ++ resources/docker_files/ubuntu-18.04/Dockerfile | 2 ++ resources/docker_files/ubuntu-20.04/Dockerfile | 4 +++- resources/docker_files/ubuntu-22.04/Dockerfile | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/resources/docker_files/ubuntu-16.04/Dockerfile b/resources/docker_files/ubuntu-16.04/Dockerfile index 0c47e4d2c..ca35178a2 100644 --- a/resources/docker_files/ubuntu-16.04/Dockerfile +++ b/resources/docker_files/ubuntu-16.04/Dockerfile @@ -89,6 +89,8 @@ RUN apt-get update -q && apt-get install -yq \ zlib1g \ # to build Mbed TLS with MBEDTLS_ZILIB_SUPPORT (removed in 3.0) zlib1g-dev \ + # to run tests in specific time. + faketime \ && rm -rf /var/lib/apt/lists/ # Install all the parts of gcc-multilib, which is necessary for 32-bit builds. diff --git a/resources/docker_files/ubuntu-18.04/Dockerfile b/resources/docker_files/ubuntu-18.04/Dockerfile index cb22b3a7b..facd04c88 100644 --- a/resources/docker_files/ubuntu-18.04/Dockerfile +++ b/resources/docker_files/ubuntu-18.04/Dockerfile @@ -89,6 +89,8 @@ RUN apt-get update -q && apt-get install -yq \ zlib1g \ # to build Mbed TLS with MBEDTLS_ZILIB_SUPPORT (removed in 3.0) zlib1g-dev \ + # to run tests in specific time. + faketime \ && rm -rf /var/lib/apt/lists/ # Install all the parts of gcc-multilib, which is necessary for 32-bit builds. diff --git a/resources/docker_files/ubuntu-20.04/Dockerfile b/resources/docker_files/ubuntu-20.04/Dockerfile index 0dc0dc448..3fbf291e1 100644 --- a/resources/docker_files/ubuntu-20.04/Dockerfile +++ b/resources/docker_files/ubuntu-20.04/Dockerfile @@ -42,7 +42,7 @@ RUN apt-get update -q && apt-get install -yq \ # for Mbed TLS tests abi-compliance-checker \ # Note that there is a known issue #5332 that stock abi tools - # in ubuntu20.04 do not fail as expected. + # in ubuntu20.04 do not fail as expected. # https://github.com/ARMmbed/mbedtls/issues/5332 # Do not activae 20.04 until that is resolved # to use with abi-compliance-tester @@ -95,6 +95,8 @@ RUN apt-get update -q && apt-get install -yq \ zlib1g \ # to build Mbed TLS with MBEDTLS_ZILIB_SUPPORT (removed in 3.0) zlib1g-dev \ + # to run tests in specific time. + faketime \ && rm -rf /var/lib/apt/lists/ # Install all the parts of gcc-multilib, which is necessary for 32-bit builds. diff --git a/resources/docker_files/ubuntu-22.04/Dockerfile b/resources/docker_files/ubuntu-22.04/Dockerfile index 15c0895d1..982852cdd 100644 --- a/resources/docker_files/ubuntu-22.04/Dockerfile +++ b/resources/docker_files/ubuntu-22.04/Dockerfile @@ -95,6 +95,8 @@ RUN apt-get update -q && apt-get install -yq \ zlib1g \ # to build Mbed TLS with MBEDTLS_ZILIB_SUPPORT (removed in 3.0) zlib1g-dev \ + # to run tests in specific time. + faketime \ && rm -rf /var/lib/apt/lists/ # Install all the parts of gcc-multilib, which is necessary for 32-bit builds. From 6d32bea9647310e784e2d7e8eb05dc1fa03dd945 Mon Sep 17 00:00:00 2001 From: Jerry Yu Date: Fri, 16 Jun 2023 15:26:45 +0800 Subject: [PATCH 2/2] improve the readability Signed-off-by: Jerry Yu --- resources/docker_files/ubuntu-16.04/Dockerfile | 4 ++-- resources/docker_files/ubuntu-18.04/Dockerfile | 4 ++-- resources/docker_files/ubuntu-20.04/Dockerfile | 4 ++-- resources/docker_files/ubuntu-22.04/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/docker_files/ubuntu-16.04/Dockerfile b/resources/docker_files/ubuntu-16.04/Dockerfile index ca35178a2..3ad56e63b 100644 --- a/resources/docker_files/ubuntu-16.04/Dockerfile +++ b/resources/docker_files/ubuntu-16.04/Dockerfile @@ -49,6 +49,8 @@ RUN apt-get update -q && apt-get install -yq \ cmake \ # to build Mbed TLS's documentation doxygen \ + # to run tests in specific time. + faketime \ # to cross-build Mbed TLS gcc-mingw-w64-i686 \ # to check out Mbed TLS and others @@ -89,8 +91,6 @@ RUN apt-get update -q && apt-get install -yq \ zlib1g \ # to build Mbed TLS with MBEDTLS_ZILIB_SUPPORT (removed in 3.0) zlib1g-dev \ - # to run tests in specific time. - faketime \ && rm -rf /var/lib/apt/lists/ # Install all the parts of gcc-multilib, which is necessary for 32-bit builds. diff --git a/resources/docker_files/ubuntu-18.04/Dockerfile b/resources/docker_files/ubuntu-18.04/Dockerfile index facd04c88..dc0e3c9ab 100644 --- a/resources/docker_files/ubuntu-18.04/Dockerfile +++ b/resources/docker_files/ubuntu-18.04/Dockerfile @@ -49,6 +49,8 @@ RUN apt-get update -q && apt-get install -yq \ cmake \ # to build Mbed TLS's documentation doxygen \ + # to run tests in specific time. + faketime \ # to cross-build Mbed TLS gcc-mingw-w64-i686 \ # to check out Mbed TLS and others @@ -89,8 +91,6 @@ RUN apt-get update -q && apt-get install -yq \ zlib1g \ # to build Mbed TLS with MBEDTLS_ZILIB_SUPPORT (removed in 3.0) zlib1g-dev \ - # to run tests in specific time. - faketime \ && rm -rf /var/lib/apt/lists/ # Install all the parts of gcc-multilib, which is necessary for 32-bit builds. diff --git a/resources/docker_files/ubuntu-20.04/Dockerfile b/resources/docker_files/ubuntu-20.04/Dockerfile index 3fbf291e1..716b20152 100644 --- a/resources/docker_files/ubuntu-20.04/Dockerfile +++ b/resources/docker_files/ubuntu-20.04/Dockerfile @@ -55,6 +55,8 @@ RUN apt-get update -q && apt-get install -yq \ cmake \ # to build Mbed TLS's documentation doxygen \ + # to run tests in specific time. + faketime \ # to cross-build Mbed TLS gcc-mingw-w64-i686 \ # to check out Mbed TLS and others @@ -95,8 +97,6 @@ RUN apt-get update -q && apt-get install -yq \ zlib1g \ # to build Mbed TLS with MBEDTLS_ZILIB_SUPPORT (removed in 3.0) zlib1g-dev \ - # to run tests in specific time. - faketime \ && rm -rf /var/lib/apt/lists/ # Install all the parts of gcc-multilib, which is necessary for 32-bit builds. diff --git a/resources/docker_files/ubuntu-22.04/Dockerfile b/resources/docker_files/ubuntu-22.04/Dockerfile index 982852cdd..9283042e7 100644 --- a/resources/docker_files/ubuntu-22.04/Dockerfile +++ b/resources/docker_files/ubuntu-22.04/Dockerfile @@ -55,6 +55,8 @@ RUN apt-get update -q && apt-get install -yq \ cmake \ # to build Mbed TLS's documentation doxygen \ + # to run tests in specific time. + faketime \ # to cross-build Mbed TLS gcc-mingw-w64-i686 \ # to check out Mbed TLS and others @@ -95,8 +97,6 @@ RUN apt-get update -q && apt-get install -yq \ zlib1g \ # to build Mbed TLS with MBEDTLS_ZILIB_SUPPORT (removed in 3.0) zlib1g-dev \ - # to run tests in specific time. - faketime \ && rm -rf /var/lib/apt/lists/ # Install all the parts of gcc-multilib, which is necessary for 32-bit builds.