diff options
| -rw-r--r-- | crb/autotest_run.py | 8 | ||||
| -rwxr-xr-x | crosperf/benchmark_run_unittest.py | 2 | ||||
| -rw-r--r-- | crosperf/experiment.py | 2 | ||||
| -rw-r--r-- | crosperf/machine_manager.py | 5 | ||||
| -rwxr-xr-x | crosperf/machine_manager_unittest.py | 8 | ||||
| -rwxr-xr-x | crosperf/results_cache_unittest.py | 20 | ||||
| -rw-r--r-- | crosperf/test_cache/compare_output/results.txt | 4 | ||||
| -rwxr-xr-x | remote_kill_test.py | 2 | ||||
| -rwxr-xr-x | remote_test.py | 2 | ||||
| -rwxr-xr-x | run_tests.py | 51 | ||||
| -rw-r--r-- | utils/file_utils.py | 4 |
11 files changed, 33 insertions, 75 deletions
diff --git a/crb/autotest_run.py b/crb/autotest_run.py index d6dc70f5..bae2547f 100644 --- a/crb/autotest_run.py +++ b/crb/autotest_run.py @@ -302,11 +302,11 @@ class AutotestRun(threading.Thread): if self.board: options += " --board=%s" % self.board if self.autotest.args: - options += " %s" % self.autotest.args + options += " --args='%s'" % self.autotest.args if "tegra2" in self.board: self.DoPowerdHack() - command += ("&& cros_sdk -- ./run_remote_tests.sh --remote=%s %s %s" % - (machine_name, - options, + command += ("&& cros_sdk -- /usr/bin/test_that %s %s %s" % + (options, + machine_name, self.autotest.name)) return self._ce.RunCommand(command, True) diff --git a/crosperf/benchmark_run_unittest.py b/crosperf/benchmark_run_unittest.py index 8bb0a3b0..07c83318 100755 --- a/crosperf/benchmark_run_unittest.py +++ b/crosperf/benchmark_run_unittest.py @@ -59,7 +59,7 @@ class BenchmarkRunTest(unittest.TestCase): image_args="", cache_dir="", cache_only=False) logging_level = "average" - m = MockMachineManager("/tmp/chromeos_root", 0, logging_level) + m = MockMachineManager("/tmp/chromeos_root", 0, logging_level, '') m.AddMachine("chromeos2-row1-rack4-host9.cros") bench = Benchmark("page_cycler.netsim.top_10", # name "page_cycler.netsim.top_10", # test_name diff --git a/crosperf/experiment.py b/crosperf/experiment.py index e34c84f8..3bcd1a83 100644 --- a/crosperf/experiment.py +++ b/crosperf/experiment.py @@ -57,7 +57,7 @@ class Experiment(object): if test_flag.GetTestMode(): self.machine_manager = MockMachineManager(chromeos_root, acquire_timeout, - log_level) + log_level, locks_directory) else: self.machine_manager = MachineManager(chromeos_root, acquire_timeout, log_level, locks_directory) diff --git a/crosperf/machine_manager.py b/crosperf/machine_manager.py index 78438839..0941e91a 100644 --- a/crosperf/machine_manager.py +++ b/crosperf/machine_manager.py @@ -502,9 +502,10 @@ class MockCrosMachine(CrosMachine): class MockMachineManager(MachineManager): - def __init__(self, chromeos_root, acquire_timeout, log_level): + def __init__(self, chromeos_root, acquire_timeout, log_level, dummy_locks_dir): super(MockMachineManager, self).__init__(chromeos_root, acquire_timeout, - log_level) + log_level, + lock_machine.Machine.LOCKS_DIR) def _TryToLockMachine(self, cros_machine): self._machines.append(cros_machine) diff --git a/crosperf/machine_manager_unittest.py b/crosperf/machine_manager_unittest.py index ee59cc88..376f8b0e 100755 --- a/crosperf/machine_manager_unittest.py +++ b/crosperf/machine_manager_unittest.py @@ -11,6 +11,7 @@ import mock import unittest import label +import lock_machine import machine_manager import image_checksummer @@ -22,7 +23,8 @@ from utils import logger class MyMachineManager(machine_manager.MachineManager): def __init__(self, chromeos_root): - super(MyMachineManager, self).__init__(chromeos_root, 0, "average") + super(MyMachineManager, self).__init__(chromeos_root, 0, "average", + lock_machine.Machine.LOCKS_DIR) def _TryToLockMachine(self, cros_machine): self._machines.append(cros_machine) @@ -65,7 +67,9 @@ class MachineManagerTest(unittest.TestCase): mock_isdir.return_value = True self.mm = machine_manager.MachineManager("/usr/local/chromeos", 0, - "average", None, self.mock_cmd_exec, + "average", + lock_machine.Machine.LOCKS_DIR, + self.mock_cmd_exec, self.mock_logger) self.mock_lumpy1.name = 'lumpy1' diff --git a/crosperf/results_cache_unittest.py b/crosperf/results_cache_unittest.py index 01959689..04e2975f 100755 --- a/crosperf/results_cache_unittest.py +++ b/crosperf/results_cache_unittest.py @@ -23,18 +23,18 @@ from utils import command_executer from utils import logger from utils import misc -OUTPUT = """CMD (True): ./run_remote_tests.sh --remote=172.17.128.241 --board=lumpy LibCBench +OUTPUT = """CMD (True): ./test_that.sh --remote=172.17.128.241 --board=lumpy LibCBench CMD (None): cd /usr/local/google/home/yunlian/gd/src/build/images/lumpy/latest/../../../../..; cros_sdk -- ./in_chroot_cmd6X7Cxu.sh -Identity added: /tmp/run_remote_tests.PO1234567/autotest_key (/tmp/run_remote_tests.PO1234567/autotest_key) +Identity added: /tmp/test_that.PO1234567/autotest_key (/tmp/test_that.PO1234567/autotest_key) INFO : Using emerged autotests already installed at /build/lumpy/usr/local/autotest. INFO : Running the following control files 1 times: INFO : * 'client/site_tests/platform_LibCBench/control' INFO : Running client test client/site_tests/platform_LibCBench/control -./server/autoserv -m 172.17.128.241 --ssh-port 22 -c client/site_tests/platform_LibCBench/control -r /tmp/run_remote_tests.PO1234567/platform_LibCBench --test-retry=0 --args +./server/autoserv -m 172.17.128.241 --ssh-port 22 -c client/site_tests/platform_LibCBench/control -r /tmp/test_that.PO1234567/platform_LibCBench --test-retry=0 --args ERROR:root:import statsd failed, no stats will be reported. -14:20:22 INFO | Results placed in /tmp/run_remote_tests.PO1234567/platform_LibCBench +14:20:22 INFO | Results placed in /tmp/test_that.PO1234567/platform_LibCBench 14:20:22 INFO | Processing control file 14:20:23 INFO | Starting master ssh connection '/usr/bin/ssh -a -x -N -o ControlMaster=yes -o ControlPath=/tmp/_autotmp_VIIP67ssh-master/socket -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o ConnectTimeout=30 -o ServerAliveInterval=180 -o ServerAliveCountMax=3 -o ConnectionAttempts=4 -o Protocol=2 -l root -p 22 172.17.128.241' 14:20:23 ERROR| [stderr] Warning: Permanently added '172.17.128.241' (RSA) to the list of known hosts. @@ -110,7 +110,7 @@ INFO : Elapsed time: 0m16s """ error = """ -ERROR: Identity added: /tmp/run_remote_tests.Z4Ld/autotest_key (/tmp/run_remote_tests.Z4Ld/autotest_key) +ERROR: Identity added: /tmp/test_that.Z4Ld/autotest_key (/tmp/test_that.Z4Ld/autotest_key) INFO : Using emerged autotests already installed at /build/lumpy/usr/local/autotest. INFO : Running the following control files 1 times: INFO : * 'client/site_tests/platform_LibCBench/control' @@ -150,9 +150,9 @@ class ResultTest(unittest.TestCase): OUTPUT, error, 0, True, 0) self.assertEqual(result.keyvals, keyvals) self.assertEqual(result.chroot_results_dir, - '/tmp/run_remote_tests.PO1234567/platform_LibCBench') + '/tmp/test_that.PO1234567/platform_LibCBench') self.assertEqual(result.results_dir, - '/tmp/chroot/tmp/run_remote_tests.PO1234567/platform_LibCBench') + '/tmp/chroot/tmp/test_that.PO1234567/platform_LibCBench') self.assertEqual(result.retval, 0) @@ -401,7 +401,7 @@ class ResultTest(unittest.TestCase): self.result.out = OUTPUT resdir = self.result._GetResultsDir() self.assertEqual(resdir, - '/tmp/run_remote_tests.PO1234567/platform_LibCBench') + '/tmp/test_that.PO1234567/platform_LibCBench') @mock.patch.object (command_executer.CommandExecuter, 'RunCommand') @@ -694,7 +694,7 @@ class ResultTest(unittest.TestCase): tempfile.mkdtemp = FakeMkdtemp mock_mm = machine_manager.MockMachineManager('/tmp/chromeos_root', 0, - 'average') + 'average', '') mock_mm.machine_checksum_string['mock_label'] = 'fake_machine_checksum123' self.result.StoreToCacheDir(cache_dir, mock_mm) @@ -776,7 +776,7 @@ class ResultsCacheTest(unittest.TestCase): mock_mm = machine_manager.MockMachineManager('/tmp/chromeos_root', 0, - 'average') + 'average', '') mock_mm.machine_checksum_string['mock_label'] = 'fake_machine_checksum123' self.results_cache.Init(self.mock_label.chromeos_image, diff --git a/crosperf/test_cache/compare_output/results.txt b/crosperf/test_cache/compare_output/results.txt index 134b8822..db6803ce 100644 --- a/crosperf/test_cache/compare_output/results.txt +++ b/crosperf/test_cache/compare_output/results.txt @@ -1,6 +1,6 @@ -S"CMD (True): ./run_remote_tests.sh --remote=172.17.128.241 --board=lumpy LibCBench\nCMD (None): cd /usr/local/google/home/yunlian/gd/src/build/images/lumpy/latest/../../../../..; cros_sdk -- ./in_chroot_cmd6X7Cxu.sh\nIdentity added: /tmp/run_remote_tests.PO1234567/autotest_key (/tmp/run_remote_tests.PO1234567/autotest_key)\nINFO : Using emerged autotests already installed at /build/lumpy/usr/local/autotest.\n\nINFO : Running the following control files 1 times:\nINFO : * 'client/site_tests/platform_LibCBench/control'\n\nINFO : Running client test client/site_tests/platform_LibCBench/control\n./server/autoserv -m 172.17.128.241 --ssh-port 22 -c client/site_tests/platform_LibCBench/control -r /tmp/run_remote_tests.PO1234567/platform_LibCBench --test-retry=0 --args \nERROR:root:import statsd failed, no stats will be reported.\n14:20:22 INFO | Results placed in /tmp/run_remote_tests.PO1234567/platform_LibCBench\n14:20:22 INFO | Processing control file\n14:20:23 INFO | Starting master ssh connection '/usr/bin/ssh -a -x -N -o ControlMaster=yes -o ControlPath=/tmp/_autotmp_VIIP67ssh-master/socket -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o ConnectTimeout=30 -o ServerAliveInterval=180 -o ServerAliveCountMax=3 -o ConnectionAttempts=4 -o Protocol=2 -l root -p 22 172.17.128.241'\n14:20:23 ERROR| [stderr] Warning: Permanently added '172.17.128.241' (RSA) to the list of known hosts.\n14:20:23 INFO | INFO\t----\t----\tkernel=3.8.11\tlocaltime=May 22 14:20:23\ttimestamp=1369257623\t\n14:20:23 INFO | Installing autotest on 172.17.128.241\n14:20:23 INFO | Using installation dir /usr/local/autotest\n14:20:23 WARNI| No job_repo_url for <remote host: 172.17.128.241>\n14:20:23 INFO | Could not install autotest using the packaging system: No repos to install an autotest client from. Trying other methods\n14:20:23 INFO | Installation of autotest completed\n14:20:24 WARNI| No job_repo_url for <remote host: 172.17.128.241>\n14:20:24 INFO | Executing /usr/local/autotest/bin/autotest /usr/local/autotest/control phase 0\n14:20:24 INFO | Entered autotestd_monitor.\n14:20:24 INFO | Finished launching tail subprocesses.\n14:20:24 INFO | Finished waiting on autotestd to start.\n14:20:26 INFO | START\t----\t----\ttimestamp=1369257625\tlocaltime=May 22 14:20:25\t\n14:20:26 INFO | \tSTART\tplatform_LibCBench\tplatform_LibCBench\ttimestamp=1369257625\tlocaltime=May 22 14:20:25\t\n14:20:30 INFO | \t\tGOOD\tplatform_LibCBench\tplatform_LibCBench\ttimestamp=1369257630\tlocaltime=May 22 14:20:30\tcompleted successfully\n14:20:30 INFO | \tEND GOOD\tplatform_LibCBench\tplatform_LibCBench\ttimestamp=1369257630\tlocaltime=May 22 14:20:30\t\n14:20:31 INFO | END GOOD\t----\t----\ttimestamp=1369257630\tlocaltime=May 22 14:20:30\t\n14:20:31 INFO | Got lock of exit_code_file.\n14:20:31 INFO | Released lock of exit_code_file and closed it.\nOUTPUT: ==============================\nOUTPUT: Current time: 2013-05-22 14:20:32.818831 Elapsed: 0:01:30 ETA: Unknown\nDone: 0% [ ]\nOUTPUT: Thread Status:\nRUNNING: 1 ('ttt: LibCBench (1)' 0:01:21)\nMachine Status:\nMachine Thread Lock Status Checksum \n172.17.128.241 ttt: LibCBench (1) True RUNNING 3ba9f2ecbb222f20887daea5583d86ba\n\nOUTPUT: ==============================\n14:20:33 INFO | Killing child processes.\n14:20:33 INFO | Client complete\n14:20:33 INFO | Finished processing control file\n14:20:33 INFO | Starting master ssh connection '/usr/bin/ssh -a -x -N -o ControlMaster=yes -o ControlPath=/tmp/_autotmp_aVJUgmssh-master/socket -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o ConnectTimeout=30 -o ServerAliveInterval=180 -o ServerAliveCountMax=3 -o ConnectionAttempts=4 -o Protocol=2 -l root -p 22 172.17.128.241'\n14:20:33 ERROR| [stderr] Warning: Permanently added '172.17.128.241' (RSA) to the list of known hosts.\n\nINFO : Test results:\n-------------------------------------------------------------------\nplatform_LibCBench [ PASSED ]\nplatform_LibCBench/platform_LibCBench [ PASSED ]\nplatform_LibCBench/platform_LibCBench b_malloc_big1__0_ 0.00375231466667\nplatform_LibCBench/platform_LibCBench b_malloc_big2__0_ 0.002951359\nplatform_LibCBench/platform_LibCBench b_malloc_bubble__0_ 0.015066374\nplatform_LibCBench/platform_LibCBench b_malloc_sparse__0_ 0.015053784\nplatform_LibCBench/platform_LibCBench b_malloc_thread_local__0_ 0.01138439\nplatform_LibCBench/platform_LibCBench b_malloc_thread_stress__0_ 0.0367894733333\nplatform_LibCBench/platform_LibCBench b_malloc_tiny1__0_ 0.000768474333333\nplatform_LibCBench/platform_LibCBench b_malloc_tiny2__0_ 0.000581407333333\nplatform_LibCBench/platform_LibCBench b_pthread_create_serial1__0_ 0.0291785246667\nplatform_LibCBench/platform_LibCBench b_pthread_createjoin_serial1__0_ 0.031907936\nplatform_LibCBench/platform_LibCBench b_pthread_createjoin_serial2__0_ 0.043485347\nplatform_LibCBench/platform_LibCBench b_pthread_uselesslock__0_ 0.0294113346667\nplatform_LibCBench/platform_LibCBench b_regex_compile____a_b_c__d_b__ 0.00529833933333\nplatform_LibCBench/platform_LibCBench b_regex_search____a_b_c__d_b__ 0.00165455066667\nplatform_LibCBench/platform_LibCBench b_regex_search___a_25_b__ 0.0496191923333\nplatform_LibCBench/platform_LibCBench b_stdio_putcgetc__0_ 0.100005711667\nplatform_LibCBench/platform_LibCBench b_stdio_putcgetc_unlocked__0_ 0.0371443833333\nplatform_LibCBench/platform_LibCBench b_string_memset__0_ 0.00275405066667\nplatform_LibCBench/platform_LibCBench b_string_strchr__0_ 0.00456903\nplatform_LibCBench/platform_LibCBench b_string_strlen__0_ 0.044893587\nplatform_LibCBench/platform_LibCBench b_string_strstr___aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaac__ 0.118360778\nplatform_LibCBench/platform_LibCBench b_string_strstr___aaaaaaaaaaaaaaaaaaaaaaaaac__ 0.068957325\nplatform_LibCBench/platform_LibCBench b_string_strstr___aaaaaaaaaaaaaacccccccccccc__ 0.0135694476667\nplatform_LibCBench/platform_LibCBench b_string_strstr___abcdefghijklmnopqrstuvwxyz__ 0.0134553343333\nplatform_LibCBench/platform_LibCBench b_string_strstr___azbycxdwevfugthsirjqkplomn__ 0.0133123556667\nplatform_LibCBench/platform_LibCBench b_utf8_bigbuf__0_ 0.0473772253333\nplatform_LibCBench/platform_LibCBench b_utf8_onebyone__0_ 0.130938538333\n-------------------------------------------------------------------\nTotal PASS: 2/2 (100%)\n\nINFO : Elapsed time: 0m16s \n" +S"CMD (True): ./test_that.sh --remote=172.17.128.241 --board=lumpy LibCBench\nCMD (None): cd /usr/local/google/home/yunlian/gd/src/build/images/lumpy/latest/../../../../..; cros_sdk -- ./in_chroot_cmd6X7Cxu.sh\nIdentity added: /tmp/test_that.PO1234567/autotest_key (/tmp/test_that.PO1234567/autotest_key)\nINFO : Using emerged autotests already installed at /build/lumpy/usr/local/autotest.\n\nINFO : Running the following control files 1 times:\nINFO : * 'client/site_tests/platform_LibCBench/control'\n\nINFO : Running client test client/site_tests/platform_LibCBench/control\n./server/autoserv -m 172.17.128.241 --ssh-port 22 -c client/site_tests/platform_LibCBench/control -r /tmp/test_that.PO1234567/platform_LibCBench --test-retry=0 --args \nERROR:root:import statsd failed, no stats will be reported.\n14:20:22 INFO | Results placed in /tmp/test_that.PO1234567/platform_LibCBench\n14:20:22 INFO | Processing control file\n14:20:23 INFO | Starting master ssh connection '/usr/bin/ssh -a -x -N -o ControlMaster=yes -o ControlPath=/tmp/_autotmp_VIIP67ssh-master/socket -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o ConnectTimeout=30 -o ServerAliveInterval=180 -o ServerAliveCountMax=3 -o ConnectionAttempts=4 -o Protocol=2 -l root -p 22 172.17.128.241'\n14:20:23 ERROR| [stderr] Warning: Permanently added '172.17.128.241' (RSA) to the list of known hosts.\n14:20:23 INFO | INFO\t----\t----\tkernel=3.8.11\tlocaltime=May 22 14:20:23\ttimestamp=1369257623\t\n14:20:23 INFO | Installing autotest on 172.17.128.241\n14:20:23 INFO | Using installation dir /usr/local/autotest\n14:20:23 WARNI| No job_repo_url for <remote host: 172.17.128.241>\n14:20:23 INFO | Could not install autotest using the packaging system: No repos to install an autotest client from. Trying other methods\n14:20:23 INFO | Installation of autotest completed\n14:20:24 WARNI| No job_repo_url for <remote host: 172.17.128.241>\n14:20:24 INFO | Executing /usr/local/autotest/bin/autotest /usr/local/autotest/control phase 0\n14:20:24 INFO | Entered autotestd_monitor.\n14:20:24 INFO | Finished launching tail subprocesses.\n14:20:24 INFO | Finished waiting on autotestd to start.\n14:20:26 INFO | START\t----\t----\ttimestamp=1369257625\tlocaltime=May 22 14:20:25\t\n14:20:26 INFO | \tSTART\tplatform_LibCBench\tplatform_LibCBench\ttimestamp=1369257625\tlocaltime=May 22 14:20:25\t\n14:20:30 INFO | \t\tGOOD\tplatform_LibCBench\tplatform_LibCBench\ttimestamp=1369257630\tlocaltime=May 22 14:20:30\tcompleted successfully\n14:20:30 INFO | \tEND GOOD\tplatform_LibCBench\tplatform_LibCBench\ttimestamp=1369257630\tlocaltime=May 22 14:20:30\t\n14:20:31 INFO | END GOOD\t----\t----\ttimestamp=1369257630\tlocaltime=May 22 14:20:30\t\n14:20:31 INFO | Got lock of exit_code_file.\n14:20:31 INFO | Released lock of exit_code_file and closed it.\nOUTPUT: ==============================\nOUTPUT: Current time: 2013-05-22 14:20:32.818831 Elapsed: 0:01:30 ETA: Unknown\nDone: 0% [ ]\nOUTPUT: Thread Status:\nRUNNING: 1 ('ttt: LibCBench (1)' 0:01:21)\nMachine Status:\nMachine Thread Lock Status Checksum \n172.17.128.241 ttt: LibCBench (1) True RUNNING 3ba9f2ecbb222f20887daea5583d86ba\n\nOUTPUT: ==============================\n14:20:33 INFO | Killing child processes.\n14:20:33 INFO | Client complete\n14:20:33 INFO | Finished processing control file\n14:20:33 INFO | Starting master ssh connection '/usr/bin/ssh -a -x -N -o ControlMaster=yes -o ControlPath=/tmp/_autotmp_aVJUgmssh-master/socket -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o ConnectTimeout=30 -o ServerAliveInterval=180 -o ServerAliveCountMax=3 -o ConnectionAttempts=4 -o Protocol=2 -l root -p 22 172.17.128.241'\n14:20:33 ERROR| [stderr] Warning: Permanently added '172.17.128.241' (RSA) to the list of known hosts.\n\nINFO : Test results:\n-------------------------------------------------------------------\nplatform_LibCBench [ PASSED ]\nplatform_LibCBench/platform_LibCBench [ PASSED ]\nplatform_LibCBench/platform_LibCBench b_malloc_big1__0_ 0.00375231466667\nplatform_LibCBench/platform_LibCBench b_malloc_big2__0_ 0.002951359\nplatform_LibCBench/platform_LibCBench b_malloc_bubble__0_ 0.015066374\nplatform_LibCBench/platform_LibCBench b_malloc_sparse__0_ 0.015053784\nplatform_LibCBench/platform_LibCBench b_malloc_thread_local__0_ 0.01138439\nplatform_LibCBench/platform_LibCBench b_malloc_thread_stress__0_ 0.0367894733333\nplatform_LibCBench/platform_LibCBench b_malloc_tiny1__0_ 0.000768474333333\nplatform_LibCBench/platform_LibCBench b_malloc_tiny2__0_ 0.000581407333333\nplatform_LibCBench/platform_LibCBench b_pthread_create_serial1__0_ 0.0291785246667\nplatform_LibCBench/platform_LibCBench b_pthread_createjoin_serial1__0_ 0.031907936\nplatform_LibCBench/platform_LibCBench b_pthread_createjoin_serial2__0_ 0.043485347\nplatform_LibCBench/platform_LibCBench b_pthread_uselesslock__0_ 0.0294113346667\nplatform_LibCBench/platform_LibCBench b_regex_compile____a_b_c__d_b__ 0.00529833933333\nplatform_LibCBench/platform_LibCBench b_regex_search____a_b_c__d_b__ 0.00165455066667\nplatform_LibCBench/platform_LibCBench b_regex_search___a_25_b__ 0.0496191923333\nplatform_LibCBench/platform_LibCBench b_stdio_putcgetc__0_ 0.100005711667\nplatform_LibCBench/platform_LibCBench b_stdio_putcgetc_unlocked__0_ 0.0371443833333\nplatform_LibCBench/platform_LibCBench b_string_memset__0_ 0.00275405066667\nplatform_LibCBench/platform_LibCBench b_string_strchr__0_ 0.00456903\nplatform_LibCBench/platform_LibCBench b_string_strlen__0_ 0.044893587\nplatform_LibCBench/platform_LibCBench b_string_strstr___aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaac__ 0.118360778\nplatform_LibCBench/platform_LibCBench b_string_strstr___aaaaaaaaaaaaaaaaaaaaaaaaac__ 0.068957325\nplatform_LibCBench/platform_LibCBench b_string_strstr___aaaaaaaaaaaaaacccccccccccc__ 0.0135694476667\nplatform_LibCBench/platform_LibCBench b_string_strstr___abcdefghijklmnopqrstuvwxyz__ 0.0134553343333\nplatform_LibCBench/platform_LibCBench b_string_strstr___azbycxdwevfugthsirjqkplomn__ 0.0133123556667\nplatform_LibCBench/platform_LibCBench b_utf8_bigbuf__0_ 0.0473772253333\nplatform_LibCBench/platform_LibCBench b_utf8_onebyone__0_ 0.130938538333\n-------------------------------------------------------------------\nTotal PASS: 2/2 (100%)\n\nINFO : Elapsed time: 0m16s \n" p0 -.S"\nERROR: Identity added: /tmp/run_remote_tests.Z4Ld/autotest_key (/tmp/run_remote_tests.Z4Ld/autotest_key)\nINFO : Using emerged autotests already installed at /build/lumpy/usr/local/autotest.\nINFO : Running the following control files 1 times:\nINFO : * 'client/site_tests/platform_LibCBench/control'\nINFO : Running client test client/site_tests/platform_LibCBench/control\nINFO : Test results:\nINFO : Elapsed time: 0m18s\n" +.S"\nERROR: Identity added: /tmp/test_that.Z4Ld/autotest_key (/tmp/test_that.Z4Ld/autotest_key)\nINFO : Using emerged autotests already installed at /build/lumpy/usr/local/autotest.\nINFO : Running the following control files 1 times:\nINFO : * 'client/site_tests/platform_LibCBench/control'\nINFO : Running client test client/site_tests/platform_LibCBench/control\nINFO : Test results:\nINFO : Elapsed time: 0m18s\n" p0 .I0 .
\ No newline at end of file diff --git a/remote_kill_test.py b/remote_kill_test.py index d0547060..ca1bc5fd 100755 --- a/remote_kill_test.py +++ b/remote_kill_test.py @@ -2,7 +2,7 @@ # # Copyright 2010 Google Inc. All Rights Reserved. -"""Script to wrap run_remote_tests.sh script. +"""Script to wrap test_that script. Run this script and kill it. Then run ps -ef to see if sleep is still running,. diff --git a/remote_test.py b/remote_test.py index 37ac2b7f..f3ff3fc0 100755 --- a/remote_test.py +++ b/remote_test.py @@ -2,7 +2,7 @@ # # Copyright 2010 Google Inc. All Rights Reserved. -"""Script to wrap run_remote_tests.sh script. +"""Script to wrap test_that script. This script can login to the chromeos machine using the test private key. """ diff --git a/run_tests.py b/run_tests.py index 31f1708f..07174cb2 100755 --- a/run_tests.py +++ b/run_tests.py @@ -21,55 +21,8 @@ import build_chromeos 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)) diff --git a/utils/file_utils.py b/utils/file_utils.py index 86a3172b..74573344 100644 --- a/utils/file_utils.py +++ b/utils/file_utils.py @@ -39,8 +39,8 @@ class FileUtils(object): def CanonicalizeChromeOSRoot(self, chromeos_root): chromeos_root = os.path.expanduser(chromeos_root) - if os.path.isfile(os.path.join(chromeos_root, - "src/scripts/run_remote_tests.sh")): + if os.path.isdir(os.path.join(chromeos_root, + "chromite")): return chromeos_root else: return None |