diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2017-09-16 03:56:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-16 03:56:47 +0000 |
| commit | 6f73f46c386ac545c8fce10afb554c312afdfec3 (patch) | |
| tree | 22cf5e18ede4b49321aa1d9b4874ebe77ab00e72 | |
| parent | d87d593acb228e2f54dd76a5c3e657d854d4c2e4 (diff) | |
| parent | ec83f1634e115ea7e286c9e28023226fa06c2f85 (diff) | |
| download | extras-6f73f46c386ac545c8fce10afb554c312afdfec3.tar.gz | |
Merge "release-request-8a6a1d17-d673-453b-8612-ea961499cd38-for-aosp-oreo-cts-release-4341710 snap-temp-L24800000103383547" into oreo-cts-release
| -rw-r--r-- | simpleperf/cmd_report_sample.cpp | 2 | ||||
| -rw-r--r-- | tests/kernel.config/AndroidTest.xml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/simpleperf/cmd_report_sample.cpp b/simpleperf/cmd_report_sample.cpp index 886d1b4c..83dc90bf 100644 --- a/simpleperf/cmd_report_sample.cpp +++ b/simpleperf/cmd_report_sample.cpp @@ -186,7 +186,6 @@ bool ReportSampleCommand::Run(const std::vector<std::string>& args) { return false; } protobuf_coded_os.reset(nullptr); - google::protobuf::ShutdownProtobufLibrary(); } else { PrintLostSituation(); fflush(report_fp_); @@ -332,7 +331,6 @@ bool ReportSampleCommand::DumpProtobufReport(const std::string& filename) { return false; } } - google::protobuf::ShutdownProtobufLibrary(); return true; } diff --git a/tests/kernel.config/AndroidTest.xml b/tests/kernel.config/AndroidTest.xml index 1e50e0a6..df7aa49b 100644 --- a/tests/kernel.config/AndroidTest.xml +++ b/tests/kernel.config/AndroidTest.xml @@ -23,5 +23,8 @@ <test class="com.android.tradefed.testtype.GTest" > <option name="native-test-device-path" value="/data/local/tmp" /> <option name="module-name" value="CtsKernelConfigTestCases" /> + <!-- Make sure there is some data in the pstore --> + <option name="before-test-cmd" value="echo HELLOWORLD >/dev/pmsg0" /> + <option name="reboot-before-test" value="true" /> </test> </configuration> |