Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Update the way that run_page_cycler.py detectes instrumentation failures.

Browse Source 
* Use Debug.getMemoryInfo to collect memory information in LoadTestAutoTest.
This commit is contained in:
Guang Zhu
2009-04-16 10:16:36 -07:00
parent 7a430cf152
commit 23a4e88162
2 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/DumpRenderTree/run_page_cycler.py
View File

@@ -59,7 +59,8 @@ def main(options, args):
run_load_test_cmd = run_load_test_cmd_prefix + " -e class com.android.dumprendertree.LoadTestsAutoTest#runTest -e path \"" + path + "\" -e timeout " + timeout_ms + run_load_test_cmd_postfix
(adb_output, adb_error) = subprocess.Popen(run_load_test_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
if adb_output.find('INSTRUMENTATION_FAILED') != -1:
if adb_output.find('INSTRUMENTATION_FAILED') != -1 or \
adb_output.find('Process crashed.') != -1:
logging.error("Error happened : " + adb_output)
sys.exit(1)

60
tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java
View File

@@ -16,14 +16,14 @@
package com.android.dumprendertree;
import android.app.Activity;
import android.app.Instrumentation;
import android.app.Instrumentation.ActivityMonitor;
import android.content.Intent;
import android.util.Log;
import android.os.Bundle;
import android.os.Debug;
import android.os.Debug.MemoryInfo;
import android.test.ActivityInstrumentationTestCase2;
import com.android.dumprendertree.TestShellActivity;
@@ -33,6 +33,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintStream;
class StreamPipe extends Thread {
InputStream in;
@@ -92,35 +93,54 @@ public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShel
// TODO(fqian): let am instrumentation pass in the command line, currently
// am instrument does not allow spaces in the command.
runPostShellCommand("/system/bin/dumpsys meminfo");
dumpMemoryInfo();
// Kill activity
activity.finish();
}
private void runPostShellCommand(String cmd) {
if (cmd == null || cmd.length() == 0)
return;
private void dumpMemoryInfo() {
try {
// Call dumpsys meminfo
Process proc = Runtime.getRuntime().exec(cmd);
// Append output to LOAD_TEST_RESULT
InputStream input = proc.getInputStream();
InputStream error = proc.getErrorStream();
Log.v(LOGTAG, "Dumping memory information.");
FileOutputStream out = new FileOutputStream(LOAD_TEST_RESULT, true);
StreamPipe p_in = new StreamPipe(input, out);
StreamPipe p_err = new StreamPipe(error, System.err);
PrintStream ps = new PrintStream(out);
p_in.start();
p_err.start();
MemoryInfo mi = new MemoryInfo();
Debug.getMemoryInfo(mi);
proc.waitFor();
//try to fake the dumpsys format
//this will eventually be changed to XML
String format = "%15s:%9d%9d%9d%9d";
String pss =
String.format(format, "(Pss)",
mi.nativePss, mi.dalvikPss, mi.otherPss,
mi.nativePss + mi.dalvikPss + mi.otherPss);
String sd =
String.format(format, "(shared dirty)",
mi.nativeSharedDirty, mi.dalvikSharedDirty, mi.otherSharedDirty,
mi.nativeSharedDirty + mi.dalvikSharedDirty + mi.otherSharedDirty);
String pd =
String.format(format, "(priv dirty)",
mi.nativePrivateDirty, mi.dalvikPrivateDirty, mi.otherPrivateDirty,
mi.nativePrivateDirty + mi.dalvikPrivateDirty + mi.otherPrivateDirty);
ps.print("\n\n\n");
ps.println("** MEMINFO in pid 0 [com.android.dumprendertree] **");
ps.println(" native dalvik other total");
ps.println(" size: 12060 5255 N/A 17315");
ps.println(" allocated: 12060 5255 N/A 17315");
ps.println(" free: 12060 5255 N/A 17315");
ps.println(pss);
ps.println(sd);
ps.println(pd);
ps.print("\n\n\n");
ps.flush();
ps.close();
out.flush();
out.close();
} catch (IOException e) {
Log.e(LOGTAG, e.getMessage());
} catch (InterruptedException e) {
Log.e(LOGTAG, e.getMessage());
}
}