[PATCH v3 lkp-tests 1/3] lib/job.rb: fix bug: add_define_files not work
[why] multi-task job.yaml like this: program-0: xxx: program-1: xxx: the add_define_files will not work, because the following paths actually don't exist: $LKP_SRC/*/$program-$d $LKP_SRC/*/*/$program-$d $LKP_SRC/*/$program-$d/* $LKP_SRC/*/*/$program-$d/* Signed-off-by: Li Ping <15396232681@163.com> --- lib/job.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/job.rb b/lib/job.rb index 5c2c9517..3383897c 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -626,6 +626,7 @@ class Job programs_params_hash = @job["pp"] || {} program_name_list = programs_params_hash.keys || [] program_name_list.each do |program| + program = $1 if program =~ /^(.*)-\d+?/ # if job is run as makepkg, makepkg-deps, pack-deps, cci-makepkg, cci-depends # then use makepkg's benchmark as program to get define_files -- 2.23.0
On Wed, Nov 04, 2020 at 09:02:28PM +0800, Li Ping wrote:
[why] multi-task job.yaml like this: program-0: xxx: program-1: xxx: the add_define_files will not work, because the following paths actually don't exist: $LKP_SRC/*/$program-$d $LKP_SRC/*/*/$program-$d $LKP_SRC/*/$program-$d/* $LKP_SRC/*/*/$program-$d/*
Signed-off-by: Li Ping <15396232681@163.com> --- lib/job.rb | 1 + 1 file changed, 1 insertion(+)
diff --git a/lib/job.rb b/lib/job.rb index 5c2c9517..3383897c 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -626,6 +626,7 @@ class Job programs_params_hash = @job["pp"] || {} program_name_list = programs_params_hash.keys || [] program_name_list.each do |program| + program = $1 if program =~ /^(.*)-\d+?/
Add $ to end of pattern?
# if job is run as makepkg, makepkg-deps, pack-deps, cci-makepkg, cci-depends # then use makepkg's benchmark as program to get define_files -- 2.23.0
On Thu, Nov 05, 2020 at 09:30:50AM +0800, Wu Fengguang wrote:
On Wed, Nov 04, 2020 at 09:02:28PM +0800, Li Ping wrote:
[why] multi-task job.yaml like this: program-0: xxx: program-1: xxx: the add_define_files will not work, because the following paths actually don't exist: $LKP_SRC/*/$program-$d $LKP_SRC/*/*/$program-$d $LKP_SRC/*/$program-$d/* $LKP_SRC/*/*/$program-$d/*
Signed-off-by: Li Ping <15396232681@163.com> --- lib/job.rb | 1 + 1 file changed, 1 insertion(+)
diff --git a/lib/job.rb b/lib/job.rb index 5c2c9517..3383897c 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -626,6 +626,7 @@ class Job programs_params_hash = @job["pp"] || {} program_name_list = programs_params_hash.keys || [] program_name_list.each do |program| + program = $1 if program =~ /^(.*)-\d+?/
Add $ to end of pattern?
ok, i forget it.
# if job is run as makepkg, makepkg-deps, pack-deps, cci-makepkg, cci-depends # then use makepkg's benchmark as program to get define_files -- 2.23.0
participants (2)
-
Li Ping -
Wu Fengguang