Install lib/pm_sched_mc.py into testcases/bin instead of testcases/bin/lib directory, and modify the corresponding call files, eg. pm_cpu_consolidation.py.
Signed-off-by: Xing Gu <gux.f...@cn.fujitsu.com> --- testcases/kernel/power_management/Makefile | 10 ++++----- testcases/kernel/power_management/lib/Makefile | 25 ++++++++++++++++++++++ .../power_management/pm_cpu_consolidation.py | 2 -- testcases/kernel/power_management/pm_ilb_test.py | 2 -- .../kernel/power_management/pm_sched_domain.py | 2 -- 5 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 testcases/kernel/power_management/lib/Makefile diff --git a/testcases/kernel/power_management/Makefile b/testcases/kernel/power_management/Makefile index 24f75f8..935f47e 100644 --- a/testcases/kernel/power_management/Makefile +++ b/testcases/kernel/power_management/Makefile @@ -13,8 +13,8 @@ ## 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 ## +## along with this program; if not, write to the Free Software Foundation, ## +## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ## ## ## ################################################################################ @@ -22,10 +22,8 @@ top_srcdir ?= ../../.. include $(top_srcdir)/include/mk/testcases.mk -vpath %.c $(srcdir):$(top_srcdir)/lib - -INSTALL_TARGETS := lib/*.py *.py *.sh +INSTALL_TARGETS := *.py *.sh MAKE_DEPS += $(APICMDS_DIR)/tst_kvercmp -include $(top_srcdir)/include/mk/generic_leaf_target.mk +include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/power_management/lib/Makefile b/testcases/kernel/power_management/lib/Makefile new file mode 100644 index 0000000..2aadac0 --- /dev/null +++ b/testcases/kernel/power_management/lib/Makefile @@ -0,0 +1,25 @@ +# +# Copyright (c) 2015 Fujitsu Ltd. +# +# 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. +# + +top_srcdir ?= ../../../.. + +include $(top_srcdir)/include/mk/env_pre.mk + +INSTALL_TARGETS := *.py + +include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/power_management/pm_cpu_consolidation.py b/testcases/kernel/power_management/pm_cpu_consolidation.py index 5aa3948..734db27 100755 --- a/testcases/kernel/power_management/pm_cpu_consolidation.py +++ b/testcases/kernel/power_management/pm_cpu_consolidation.py @@ -6,8 +6,6 @@ import os import sys import time -LIB_DIR = "%s/lib" % os.path.dirname(__file__) -sys.path.append(LIB_DIR) from optparse import OptionParser from pm_sched_mc import * diff --git a/testcases/kernel/power_management/pm_ilb_test.py b/testcases/kernel/power_management/pm_ilb_test.py index 3f6ad46..0b447d8 100755 --- a/testcases/kernel/power_management/pm_ilb_test.py +++ b/testcases/kernel/power_management/pm_ilb_test.py @@ -5,8 +5,6 @@ import os import sys -LIB_DIR = "%s/lib" % os.path.dirname(__file__) -sys.path.append(LIB_DIR) from optparse import OptionParser from pm_sched_mc import * diff --git a/testcases/kernel/power_management/pm_sched_domain.py b/testcases/kernel/power_management/pm_sched_domain.py index a636c48..a54b0e9 100755 --- a/testcases/kernel/power_management/pm_sched_domain.py +++ b/testcases/kernel/power_management/pm_sched_domain.py @@ -5,8 +5,6 @@ import os import sys -LIB_DIR = "%s/lib" % os.path.dirname(__file__) -sys.path.append(LIB_DIR) from pm_sched_mc import * from optparse import OptionParser -- 1.9.3 ------------------------------------------------------------------------------ One dashboard for servers and applications across Physical-Virtual-Cloud Widest out-of-the-box monitoring support with 50+ applications Performance metrics, stats and reports that give you Actionable Insights Deep dive visibility with transaction tracing using APM Insight. http://ad.doubleclick.net/ddm/clk/290420510;117567292;y _______________________________________________ Ltp-list mailing list Ltp-list@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ltp-list
