diff options
| -rwxr-xr-x | buildbot_test_toolchains.py | 18 | ||||
| -rwxr-xr-x | crosperf/crosperf.py | 10 | ||||
| -rwxr-xr-x | test_toolchains.py | 18 |
3 files changed, 24 insertions, 22 deletions
diff --git a/buildbot_test_toolchains.py b/buildbot_test_toolchains.py index d3ca176b..94788da8 100755 --- a/buildbot_test_toolchains.py +++ b/buildbot_test_toolchains.py @@ -44,7 +44,7 @@ class ToolchainComparator(): Class for doing the nightly tests work. """ - def __init__(self, board, remotes, chromeos_root, weekday, patches, schedv2=False): + def __init__(self, board, remotes, chromeos_root, weekday, patches, noschedv2=False): self._board = board self._remotes = remotes self._chromeos_root = chromeos_root @@ -54,7 +54,7 @@ class ToolchainComparator(): self._build = "%s-release" % board self._patches = patches.split(',') self._patches_string = '_'.join(str(p) for p in self._patches) - self._schedv2 = schedv2 + self._noschedv2 = noschedv2 if not weekday: self._weekday = time.strftime("%a") @@ -142,12 +142,12 @@ class ToolchainComparator(): crosperf = os.path.join(TOOLCHAIN_DIR, "crosperf", "crosperf") - schedv2_opts = '--schedv2 --logging_level=verbose' if self._schedv2 else '' + noschedv2_opts = '--noschedv2' if self._noschedv2 else '' command = ("{crosperf} --no_email=True --results_dir={r_dir} " - "--json_report=True {schedv2_opts} {exp_file}").format( + "--json_report=True {noschedv2_opts} {exp_file}").format( crosperf=crosperf, r_dir=self._reports_dir, - schedv2_opts=schedv2_opts, + noschedv2_opts=noschedv2_opts, exp_file=experiment_file) ret = self._ce.RunCommand(command) @@ -289,11 +289,11 @@ def Main(argv): help="The patches to use for the testing, " "seprate the patch numbers with ',' " "for more than one patches.") - parser.add_option("--schedv2", - dest="schedv2", + parser.add_option("--noschedv2", + dest="noschedv2", action="store_true", default=False, - help="Pass --schedv2 to crosperf.") + help="Pass --noschedv2 to crosperf.") options, _ = parser.parse_args(argv) if not options.board: @@ -312,7 +312,7 @@ def Main(argv): fc = ToolchainComparator(options.board, options.remote, options.chromeos_root, options.weekday, patches, - options.schedv2) + options.noschedv2) return fc.DoAll() diff --git a/crosperf/crosperf.py b/crosperf/crosperf.py index 1e934e87..44567fa6 100755 --- a/crosperf/crosperf.py +++ b/crosperf/crosperf.py @@ -64,10 +64,12 @@ def Main(argv): formatter=MyIndentedHelpFormatter(), version="%prog 3.0") - parser.add_option("--schedv2", - dest="schedv2", + parser.add_option("--noschedv2", + dest="noschedv2", + default=False, action="store_true", - help="Use crosperf scheduler v2 (feature in progress).") + help=("Do not use new scheduler. " + "Use original scheduler instead.")) parser.add_option("-l", "--log_dir", dest="log_dir", default="", @@ -108,7 +110,7 @@ def Main(argv): runner = MockExperimentRunner(experiment) else: runner = ExperimentRunner(experiment, json_report, - using_schedv2=options.schedv2) + using_schedv2=!options.noschedv2) runner.Run() diff --git a/test_toolchains.py b/test_toolchains.py index 01606a2d..ceb39280 100755 --- a/test_toolchains.py +++ b/test_toolchains.py @@ -150,7 +150,7 @@ class ChromeOSCheckout(object): class ToolchainComparator(ChromeOSCheckout): def __init__(self, board, remotes, configs, clean, - public, force_mismatch, schedv2=False): + public, force_mismatch, noschedv2=False): self._board = board self._remotes = remotes self._chromeos_root = "chromeos" @@ -165,7 +165,7 @@ class ToolchainComparator(ChromeOSCheckout): self._reports_dir = os.path.join(NIGHTLY_TESTS_DIR, "%s.%s" % (timestamp, board), ) - self._schedv2 = schedv2 + self._noschedv2 = noschedv2 ChromeOSCheckout.__init__(self, board, self._chromeos_root) @@ -245,12 +245,12 @@ class ToolchainComparator(ChromeOSCheckout): crosperf = os.path.join(os.path.dirname(__file__), "crosperf", "crosperf") - schedv2_opts = '--schedv2 --logging_level=verbose' if self._schedv2 else '' + noschedv2_opts = '--noschedv2' if self._noschedv2 else '' command = ("{crosperf} --no_email=True --results_dir={r_dir} " - "--json_report=True {schedv2_opts} {exp_file}").format( + "--json_report=True {noschedv2_opts} {exp_file}").format( crosperf=crosperf, r_dir=self._reports_dir, - schedv2_opts=schedv2_opts, + noschedv2_opts=noschedv2_opts, exp_file=experiment_file) ret = self._ce.RunCommand(command) @@ -365,11 +365,11 @@ def Main(argv): dest="force_mismatch", default="", help="Force the image regardless of board mismatch") - parser.add_option("--schedv2", - dest="schedv2", + parser.add_option("--noschedv2", + dest="noschedv2", action="store_true", default=False, - help="Pass --schedv2 to crosperf.") + help="Pass --noschedv2 to crosperf.") options, _ = parser.parse_args(argv) if not options.board: print "Please give a board." @@ -385,7 +385,7 @@ def Main(argv): fc = ToolchainComparator(options.board, options.remote, toolchain_configs, options.clean, options.public, options.force_mismatch, - options.schedv2) + options.noschedv2) return fc.DoAll() |