[gnome-continuous-yocto/gnomeostree-3.22-krogoth: 222/246] openssl.inc: avoid random ptest failures



commit dd20601980a8709acddb159000cc8d880dc9e047
Author: Patrick Ohly <patrick ohly intel com>
Date:   Fri Sep 23 15:23:20 2016 +0200

    openssl.inc: avoid random ptest failures
    
    "make alltests" is sensitive to the timestamps of the installed
    files. Depending on the order in which cp copies files, .o and/or
    executables may end up with time stamps older than the source files.
    Running tests then triggers recompilation attempts, which typically
    will fail because dev tools and files are not installed.
    
    "cp -a" is not enough because the files also have to be newer than
    the installed header files. Setting the file time stamps to
    the current time explicitly after copying solves the problem because
    do_install_ptest_base is guaranteed to run after do_install.
    
    (From OE-Core rev: 101e2a5e0b7822ca3de3d3a73369405c05ab3c5b)
    
    (From OE-Core rev: b309bfa265456cda7269ff67e9df5f5c05a9a5a5)
    
    Signed-off-by: Patrick Ohly <patrick ohly intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-connectivity/openssl/openssl.inc |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 20dd740..2e2000c 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -215,6 +215,19 @@ do_install_ptest () {
        mkdir -p ${D}${PTEST_PATH}/util
        install util/opensslwrap.sh    ${D}${PTEST_PATH}/util
        install util/shlib_wrap.sh     ${D}${PTEST_PATH}/util
+       # Time stamps are relevant for "make alltests", otherwise
+       # make may try to recompile binaries. Not only must the
+       # binary files be newer than the sources, they also must
+       # be more recent than the header files in /usr/include.
+       #
+       # Using "cp -a" is not sufficient, because do_install
+       # does not preserve the original time stamps.
+       #
+       # So instead of using the original file stamps, we set
+       # the current time for all files. Binaries will get
+       # modified again later when stripping them, but that's okay.
+       touch ${D}${PTEST_PATH}
+       find ${D}${PTEST_PATH} -type f -print0 | xargs --verbose -0 touch -r ${D}${PTEST_PATH}
 }
 
 do_install_append_class-native() {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]