From 236749e33c5b54079ae4030753da67ad6df041c9 Mon Sep 17 00:00:00 2001 From: Milosz Wasilewski Date: Mon, 5 Dec 2016 14:49:30 +0000 Subject: automated: libhugetlbfs fix for running on distro kernel Config file for distro kernel is located in /boot rather than in /proc. This patch adds support for both options Change-Id: Ie516fba4e3e37d58508f013e9287964cf5a362e3 Signed-off-by: Milosz Wasilewski --- automated/linux/libhugetlbfs/libhugetlbfs.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/automated/linux/libhugetlbfs/libhugetlbfs.sh b/automated/linux/libhugetlbfs/libhugetlbfs.sh index 1570816..252dc1c 100755 --- a/automated/linux/libhugetlbfs/libhugetlbfs.sh +++ b/automated/linux/libhugetlbfs/libhugetlbfs.sh @@ -105,9 +105,19 @@ cd "${OUTPUT}" info_msg "About to run libhugetlbfs test..." info_msg "Output directory: ${OUTPUT}" - +if [ -f /proc/config.gz ] +then CONFIG_HUGETLBFS=$(zcat /proc/config.gz | grep "CONFIG_HUGETLBFS=") CONFIG_HUGETLB_PAGE=$(zcat /proc/config.gz | grep "CONFIG_HUGETLB_PAGE=") +elif [ -f /boot/config-"$(uname -r)" ] +then +KERNEL_CONFIG_FILE="/boot/config-$(uname -r)" +CONFIG_HUGETLBFS=$(grep "CONFIG_HUGETLBFS=" "${KERNEL_CONFIG_FILE}") +CONFIG_HUGETLB_PAGE=$(grep "CONFIG_HUGETLB_PAGE=" "${KERNEL_CONFIG_FILE}") +else +exit_on_skip "libhugetlb-pre-requirements" "Kernel config file not available" +fi + HUGETLBFS=$(grep hugetlbfs /proc/filesystems | awk '{print $2}') [ "${CONFIG_HUGETLBFS}" = "CONFIG_HUGETLBFS=y" ] && [ "${CONFIG_HUGETLB_PAGE}" = "CONFIG_HUGETLB_PAGE=y" ] && [ "${HUGETLBFS}" = "hugetlbfs" ] -- cgit v1.2.3