From 3dfd0e131efab40df4beba1e40d232a4fcf807dc Mon Sep 17 00:00:00 2001 From: Guang Zhu Date: Tue, 2 Jun 2009 15:42:48 -0700 Subject: Fixed issue where code for extracting scripts was eclipsed by runTest method. --- tests/DumpRenderTree/assets/run_reliability_tests.py | 8 ++------ .../src/com/android/dumprendertree/ReliabilityTest.java | 3 +-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/tests/DumpRenderTree/assets/run_reliability_tests.py b/tests/DumpRenderTree/assets/run_reliability_tests.py index c12c783060c4..84b9501620da 100755 --- a/tests/DumpRenderTree/assets/run_reliability_tests.py +++ b/tests/DumpRenderTree/assets/run_reliability_tests.py @@ -110,8 +110,8 @@ def main(options, args): # Call ReliabilityTestsAutoTest#startReliabilityTests test_cmd = (test_cmd_prefix + " -e class " "com.android.dumprendertree.ReliabilityTest#" - "runTest -e timeout %d %s" % - (timeout_ms, test_cmd_postfix)) + "runReliabilityTest -e timeout %s %s" % + (str(timeout_ms), test_cmd_postfix)) adb_output = subprocess.Popen(test_cmd, shell=True, stdout=subprocess.PIPE, @@ -125,10 +125,6 @@ def main(options, args): crashed_tests.append(crashed_test) logging.info("Resuming reliability test runner...") - test_cmd = (test_cmd_prefix + " -e class " - "com.android.dumprendertree.ReliabilityTest#" - "runTest -e timeout %d %s" % - (timeout_ms, test_cmd_postfix)) adb_output = subprocess.Popen(test_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0] diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTest.java b/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTest.java index 081ddafa24ec..aa3940ed9b04 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTest.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTest.java @@ -30,8 +30,7 @@ public class ReliabilityTest extends ActivityInstrumentationTestCase2