1_sanity_check.sh script didn't have a meaningful name. Rename it to cpuhotplug_00 as the first script to check if all cpus are online before the other cpuhotplug scripts begin.

Signed-off-by: Lisa Nguyen lisa.nguyen@linaro.org --- cpuhotplug/1_sanity_check.sh | 40 ---------------------------------------- cpuhotplug/1_sanity_check.txt | 1 - cpuhotplug/cpuhotplug_00.sh | 40 ++++++++++++++++++++++++++++++++++++++++ cpuhotplug/cpuhotplug_00.txt | 1 + 4 files changed, 41 insertions(+), 41 deletions(-) delete mode 100755 cpuhotplug/1_sanity_check.sh delete mode 100644 cpuhotplug/1_sanity_check.txt create mode 100755 cpuhotplug/cpuhotplug_00.sh create mode 100644 cpuhotplug/cpuhotplug_00.txt

diff --git a/cpuhotplug/1_sanity_check.sh b/cpuhotplug/1_sanity_check.sh deleted file mode 100755 index 634a736..0000000 --- a/cpuhotplug/1_sanity_check.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# -# PM-QA validation test suite for the power management on Linux -# -# Copyright (C) 2011, Linaro Limited. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# Contributors: -# Daniel Lezcano daniel.lezcano@linaro.org (IBM Corporation) -# - initial API and implementation -# - -# URL : - -. ../include/functions.sh - -sanity_check() { - ret=$(cat $CPU_PATH/offline) - if [ -z "$ret" ]; then - return 0 - else - return 1 - fi -} - -check "all cpu are online" "sanity_check" -test_status_show diff --git a/cpuhotplug/1_sanity_check.txt b/cpuhotplug/1_sanity_check.txt deleted file mode 100644 index 8930419..0000000 --- a/cpuhotplug/1_sanity_check.txt +++ /dev/null @@ -1 +0,0 @@ -ensure all the cpus are online before the tests diff --git a/cpuhotplug/cpuhotplug_00.sh b/cpuhotplug/cpuhotplug_00.sh new file mode 100755 index 0000000..634a736 --- /dev/null +++ b/cpuhotplug/cpuhotplug_00.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# +# PM-QA validation test suite for the power management on Linux +# +# Copyright (C) 2011, Linaro Limited. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Contributors: +# Daniel Lezcano daniel.lezcano@linaro.org (IBM Corporation) +# - initial API and implementation +# + +# URL : + +. ../include/functions.sh + +sanity_check() { + ret=$(cat $CPU_PATH/offline) + if [ -z "$ret" ]; then + return 0 + else + return 1 + fi +} + +check "all cpu are online" "sanity_check" +test_status_show diff --git a/cpuhotplug/cpuhotplug_00.txt b/cpuhotplug/cpuhotplug_00.txt new file mode 100644 index 0000000..8930419 --- /dev/null +++ b/cpuhotplug/cpuhotplug_00.txt @@ -0,0 +1 @@ +ensure all the cpus are online before the tests

Every test module has a sanity script. Add one for cputopology to check for topology entries for all cpus.

Signed-off-by: Lisa Nguyen lisa.nguyen@linaro.org --- cputopology/cputopology_sanity.sh | 49 ++++++++++++++++++++++++++++++++++++ cputopology/cputopology_sanity.txt | 1 + 2 files changed, 50 insertions(+) create mode 100755 cputopology/cputopology_sanity.sh create mode 100644 cputopology/cputopology_sanity.txt

diff --git a/cputopology/cputopology_sanity.sh b/cputopology/cputopology_sanity.sh new file mode 100755 index 0000000..698ceab --- /dev/null +++ b/cputopology/cputopology_sanity.sh @@ -0,0 +1,49 @@ +#!/bin/sh +# +# PM-QA validation test suite for the power management on Linux +# +# Copyright (C) 2015, Linaro Limited. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Contributors: +# Lisa Nguyen lisa.nguyen@linaro.org +# - initial implementation +# + +. ../include/functions.sh + +is_root +if [ $? -ne 0 ]; then + log_skip "User is not root" + exit 0 +fi + +check_cputopology_sysfs_entry() { + for cpu in $cpus; do + cputopology_sysfs_dir="$CPU_PATH/$cpu/topology" + + test -d $cputopology_sysfs_dir + if [ $? -ne 0 ]; then + echo "cputopology entry not found. Skipping all cputopology tests" + skip_tests cputopology + return 0 + fi + done + + return 1 +} + +check_cputopology_sysfs_entry diff --git a/cputopology/cputopology_sanity.txt b/cputopology/cputopology_sanity.txt new file mode 100644 index 0000000..99f927c --- /dev/null +++ b/cputopology/cputopology_sanity.txt @@ -0,0 +1 @@ +Checking for topology dir in each cpu