diff options
| -rw-r--r-- | meta/recipes-core/glibc/glibc-testing.inc | 95 | ||||
| -rw-r--r-- | meta/recipes-core/glibc/glibc.inc | 1 |
2 files changed, 0 insertions, 96 deletions
diff --git a/meta/recipes-core/glibc/glibc-testing.inc b/meta/recipes-core/glibc/glibc-testing.inc deleted file mode 100644 index 0a42ae7f7c..0000000000 --- a/meta/recipes-core/glibc/glibc-testing.inc +++ /dev/null | |||
| @@ -1,95 +0,0 @@ | |||
| 1 | do_compile_append () { | ||
| 2 | # now generate script to drive testing | ||
| 3 | echo "#!/usr/bin/env sh" >${B}/${HOST_PREFIX}testglibc | ||
| 4 | set >> ${B}/${HOST_PREFIX}testglibc | ||
| 5 | # prune out the unneeded vars | ||
| 6 | sed -i -e "/^BASH/d" ${B}/${HOST_PREFIX}testglibc | ||
| 7 | sed -i -e "/^USER/d" ${B}/${HOST_PREFIX}testglibc | ||
| 8 | sed -i -e "/^OPT/d" ${B}/${HOST_PREFIX}testglibc | ||
| 9 | sed -i -e "/^DIRSTACK/d" ${B}/${HOST_PREFIX}testglibc | ||
| 10 | sed -i -e "/^EUID/d" ${B}/${HOST_PREFIX}testglibc | ||
| 11 | sed -i -e "/^FUNCNAME/d" ${B}/${HOST_PREFIX}testglibc | ||
| 12 | sed -i -e "/^GROUPS/d" ${B}/${HOST_PREFIX}testglibc | ||
| 13 | sed -i -e "/^HOST/d" ${B}/${HOST_PREFIX}testglibc | ||
| 14 | sed -i -e "/^HOME/d" ${B}/${HOST_PREFIX}testglibc | ||
| 15 | sed -i -e "/^IFS/d" ${B}/${HOST_PREFIX}testglibc | ||
| 16 | sed -i -e "/^LC_ALL/d" ${B}/${HOST_PREFIX}testglibc | ||
| 17 | sed -i -e "/^LOGNAME/d" ${B}/${HOST_PREFIX}testglibc | ||
| 18 | sed -i -e "/^MACHTYPE/d" ${B}/${HOST_PREFIX}testglibc | ||
| 19 | sed -i -e "/^OSTYPE/d" ${B}/${HOST_PREFIX}testglibc | ||
| 20 | sed -i -e "/^PIPE/d" ${B}/${HOST_PREFIX}testglibc | ||
| 21 | sed -i -e "/^SHELL/d" ${B}/${HOST_PREFIX}testglibc | ||
| 22 | sed -i -e "/^'/d" ${B}/${HOST_PREFIX}testglibc | ||
| 23 | sed -i -e "/^UID/d" ${B}/${HOST_PREFIX}testglibc | ||
| 24 | sed -i -e "/^TERM/d" ${B}/${HOST_PREFIX}testglibc | ||
| 25 | sed -i -e "/^PKG_/d" ${B}/${HOST_PREFIX}testglibc | ||
| 26 | sed -i -e "/^POSIXLY_/d" ${B}/${HOST_PREFIX}testglibc | ||
| 27 | sed -i -e "/^PPID/d" ${B}/${HOST_PREFIX}testglibc | ||
| 28 | sed -i -e "/^PS4/d" ${B}/${HOST_PREFIX}testglibc | ||
| 29 | sed -i -e "/^Q/d" ${B}/${HOST_PREFIX}testglibc | ||
| 30 | sed -i -e "/^SHLVL/d" ${B}/${HOST_PREFIX}testglibc | ||
| 31 | sed -i -e "/^STAGING/d" ${B}/${HOST_PREFIX}testglibc | ||
| 32 | sed -i -e "/^LD_LIBRARY_PATH/d" ${B}/${HOST_PREFIX}testglibc | ||
| 33 | sed -i -e "/^PSEUDO/d" ${B}/${HOST_PREFIX}testglibc | ||
| 34 | |||
| 35 | # point to real sysroot not the toolchain bootstrap sysroot | ||
| 36 | sed -i -e "s/\-tcbootstrap//g" ${B}/${HOST_PREFIX}testglibc | ||
| 37 | |||
| 38 | # use the final cross-gcc to test since some tests need libstdc++ | ||
| 39 | sed -i -e "s/^PATH=.*\.gcc-cross-initial\:/PATH=/g" ${B}/${HOST_PREFIX}testglibc | ||
| 40 | |||
| 41 | # append execution part script | ||
| 42 | cat >> ${B}/${HOST_PREFIX}testglibc << STOP | ||
| 43 | target="\$1" | ||
| 44 | if [ "x\$target" = "x" ] | ||
| 45 | then | ||
| 46 | echo "Please specify the target machine and remote user in form of user@target" | ||
| 47 | exit 1; | ||
| 48 | fi | ||
| 49 | ssh \$target ls \$PWD\ 2>&1 > /dev/null | ||
| 50 | if [ "x\$?" != "x0" ] | ||
| 51 | then | ||
| 52 | echo "Failed connecting to \$target it could be because of:" | ||
| 53 | echo "1. You dont have passwordless ssh setup to access \$target" | ||
| 54 | echo "2. NFS share on \$target is not mounted or if mounted then not matching the build tree layout." | ||
| 55 | echo " The tree should be accessible at same location on build host and target" | ||
| 56 | echo " You can add nfs-client to IMAGE_FEATURES to get the nfs client on target" | ||
| 57 | echo "3. nfs server on build host is not running." | ||
| 58 | echo " Please make sure that you have 'no_root_squash' added in /etc/exports if you want" | ||
| 59 | echo " to test as root user on target (usually its recommended to create a non" | ||
| 60 | echo " root user." | ||
| 61 | echo " As a sanity check make sure that target can read/write to the glibc build tree" | ||
| 62 | echo " Please refer to ${S}/EGLIBC.cross-testing for further instructions on setup" | ||
| 63 | exit 1 | ||
| 64 | fi | ||
| 65 | echo "# we test using cross compiler from real sysroot therefore override the" > ${B}/configparms | ||
| 66 | echo "# definitions that come from ${B}/config.make" >> ${B}/configparms | ||
| 67 | fgrep tcbootstrap ${B}/config.make > ${B}/configparms | ||
| 68 | sed -i -e "s/\-tcbootstrap//g" ${B}/configparms | ||
| 69 | |||
| 70 | # g++ uses flag -nostdinc, so the locations of system include headers must be explicitly specified | ||
| 71 | # If the locations are not already specified in config.make, then we provide the following locations: | ||
| 72 | # <sysroot>/usr/include/c++/<g++ version> | ||
| 73 | # <sysroot>/usr/include/c++/<g++ version>/<machine> | ||
| 74 | |||
| 75 | cxxincludes=\`cat ${B}/config.make | gawk '\$1 == "c++-sysincludes"' | gawk -F"=" '{print \$2}' | sed "s/[ \t]\?//g"\` | ||
| 76 | |||
| 77 | if [ -z "\$cxxincludes" ]; then | ||
| 78 | sysroot=\`cat ${B}/configparms | sed -n "/CXX/p" | sed -e "s/^.*--sysroot=//"\` | ||
| 79 | cxx=\`cat ${B}/configparms | gawk '\$1 ~ /^CXX/' | gawk -F"=" '{print \$2}' | gawk '{print \$1}'\` | ||
| 80 | cxxmachine=\`\$cxx -dumpmachine\` | ||
| 81 | cxxversion=\`\$cxx -dumpversion\` | ||
| 82 | # pass the new value of c++-sysincludes via configparms | ||
| 83 | echo "# c++-sysincludes added:" >> ${B}/configparms | ||
| 84 | echo "c++-sysincludes = -isystem \$sysroot/usr/include/c++/\$cxxversion -isystem \$sysroot/usr/include/c++/\$cxxversion/\$cxxmachine" >> ${B}/configparms | ||
| 85 | fi | ||
| 86 | |||
| 87 | wrapper="${S}/scripts/cross-test-ssh.sh \$target" | ||
| 88 | localedef="${STAGING_BINDIR_NATIVE}/cross-localedef --little-endian --uint32-align=4" | ||
| 89 | make tests-clean | ||
| 90 | make cross-localedef="\$localedef" cross-test-wrapper="\$wrapper" -k check | ||
| 91 | rm -rf ${B}/configparms | ||
| 92 | STOP | ||
| 93 | |||
| 94 | chmod +x ${B}/${HOST_PREFIX}testglibc | ||
| 95 | } | ||
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index ea9a04ac73..58d2ba7bc4 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | require glibc-common.inc | 1 | require glibc-common.inc |
| 2 | require glibc-ld.inc | 2 | require glibc-ld.inc |
| 3 | require glibc-testing.inc | ||
| 4 | 3 | ||
| 5 | DEPENDS = "virtual/${TARGET_PREFIX}gcc libgcc-initial linux-libc-headers" | 4 | DEPENDS = "virtual/${TARGET_PREFIX}gcc libgcc-initial linux-libc-headers" |
| 6 | 5 | ||
