Remove run_remote_tests references.
run_remote_tests.sh is about to be removed from ChromeOS. This
CL removes all references to run_remote_tests from toolchain-utils.
It also updates unittests to make sure they work with recent
changes.
BUG=crbug:498778
TEST=Verifed results_cache_unittest (and all the other unittests)
works with changes.
Change-Id: Ic9413bf77a1679e1267b81b182fa7f64da2629b5
Reviewed-on: https://chrome-internal-review.googlesource.com/216884
Reviewed-by: David Sharp <dhsharp@google.com>
Commit-Queue: Caroline Tice <cmtice@google.com>
Tested-by: Caroline Tice <cmtice@google.com>
diff --git a/run_tests.py b/run_tests.py
index 31f1708..07174cb 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -21,55 +21,8 @@
def Main(argv):
"""The main function."""
- parser = optparse.OptionParser()
- parser.add_option("-c", "--chromeos_root", dest="chromeos_root",
- help="ChromeOS root checkout directory.")
- parser.add_option("-r", "--remote", dest="remote",
- help="The IP address of the remote ChromeOS machine.")
- parser.add_option("-b", "--board", dest="board",
- help="The board of the target.")
-
- (options, args) = parser.parse_args(argv)
-
- tests = ""
-
- if options.board is None or options.remote is None:
- parser.print_help()
- return -1
-
- if options.chromeos_root is None:
- m = "--chromeos_root not given. Setting ../../ as chromeos_root"
- logger.GetLogger().LogWarning(m)
- options.chromeos_root = "../.."
-
- rrt_file = "%s/src/scripts/run_remote_tests.sh" % options.chromeos_root
- if not os.path.isfile(rrt_file):
- m = "File %s not found" % rrt_file
- logger.GetLogger().LogError(m)
- return -1
-
- if args:
- tests = " " + " ".join(args[1:])
-
- case_insensitive_page = re.compile("page", re.IGNORECASE)
- tests = case_insensitive_page.sub("Page", tests)
-
- return RunRemoteTests(options.chromeos_root, options.remote,
- options.board, tests)
-
-
-def RunRemoteTests(chromeos_root, remote, board, tests):
- """Run the remote tests."""
- ce = command_executer.GetCommandExecuter()
- command = ("./run_remote_tests.sh"
- " --remote=%s"
- " --board=%s"
- " %s" %
- (remote,
- board,
- tests))
- retval = ce.ChrootRunCommand(chromeos_root, command)
- return retval
+ print "This script is deprecated. Use crosperf for running tests."
+ return 1
if __name__ == "__main__":
sys.exit(Main(sys.argv))