From e1e525663ce21ec6aff28fbc8302cede65a49352 Mon Sep 17 00:00:00 2001 From: Michelle McDaniel Date: Mon, 6 Aug 2018 18:46:02 -0700 Subject: [PATCH] Fix throughput testing (#19314) Also adds architecture to throughput trigger phrase. --- perf.groovy | 2 +- tests/scripts/run-throughput-perf.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/perf.groovy b/perf.groovy index 4212207..906d489 100644 --- a/perf.groovy +++ b/perf.groovy @@ -607,7 +607,7 @@ def static getFullThroughputJobName(def project, def os, def arch, def isPR) { if (isPR) { TriggerBuilder builder = TriggerBuilder.triggerOnPullRequest() - builder.setGithubContext("Linux Throughput Perf Test Flow") + builder.setGithubContext("Linux ${architecture} Throughput Perf Test Flow") builder.triggerOnlyOnComment() builder.setCustomTriggerPhrase("(?i).*test\\W+linux\\W+throughput\\W+flow.*") builder.triggerForBranch(branch) diff --git a/tests/scripts/run-throughput-perf.py b/tests/scripts/run-throughput-perf.py index f8b70a0..8e54642 100644 --- a/tests/scripts/run-throughput-perf.py +++ b/tests/scripts/run-throughput-perf.py @@ -178,7 +178,7 @@ def validate_args(args): valid_run_types = ['rolling', 'private'] valid_os = ['Windows_NT', 'Ubuntu14.04', 'Ubuntu16.04'] valid_opt_levels = ['full_opt', 'min_opt'] - valid_jit_names = 'ryujit' + valid_jit_names = ['ryujit'] arch = next((a for a in valid_archs if a.lower() == arch.lower()), arch) build_type = next((b for b in valid_build_types if b.lower() == build_type.lower()), build_type) @@ -192,7 +192,7 @@ def validate_args(args): validate_arg(run_type, lambda item: item in valid_run_types) validate_arg(iterations, lambda item: item > 0) validate_arg(opt_level, lambda item: item in valid_opt_levels) - validate_arg(jit_name, lambda item: item in valid_jit_names[arch]) + validate_arg(jit_name, lambda item: item in valid_jit_names) if clr_root is None: raise Exception('--clr_root must be set') -- 2.7.4