From 60cce13ceba0dc400fd4905a0c2c102650e55dad Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Mon, 15 May 2017 13:39:36 -0700 Subject: simpleperf: fix report_sample_test. When running cmd_report_sample.* tests, it may call ReportSampleCmd()->Run() more than once. If we shutdown protobuf library in one call, using protobuf in the following calls will encounter failures. Bug: http://b/37996565 Test: run CtsSimpleperfTestCases. Change-Id: I5ca217406e786645d45fda518055c4a63ab3db3c (cherry picked from commit b3675a5db81d02b07b92f8f13d37187a9cb4890c) --- simpleperf/cmd_report_sample.cpp | 2 -- 1 file changed, 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& 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; } -- cgit v1.2.3 From d96025efcfa3085e61ce9dcf27e61efeb14270b0 Mon Sep 17 00:00:00 2001 From: Yoshitaka Seto Date: Mon, 31 Jul 2017 12:24:09 +0900 Subject: Remove pstore related unit tests from CTS Pstore test cases should not belong to CTS. The test cases should be a part of GTS if really required. Bug: 63969981 Bug: 63913130 Signed-off-by: Srinavasa Nagaraju Signed-off-by: Yoshitaka Seto Tested-by: Srinavasa Nagaraju Change-Id: Ie91625fd365b17dccdb179758639492da6b49787 --- tests/kernel.config/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/kernel.config/Android.mk b/tests/kernel.config/Android.mk index 9be5d9d0..2678f274 100644 --- a/tests/kernel.config/Android.mk +++ b/tests/kernel.config/Android.mk @@ -16,7 +16,6 @@ test_c_flags := \ # Required Tests cts_src_files := \ multicast_test.cpp \ - pstore_test.cpp \ sysvipc_test.cpp \ logger_test.cpp @@ -27,6 +26,7 @@ test_src_files := \ aslr_test.cpp \ aslr_rec_test.cpp \ mmc_max_speed_test.cpp \ + pstore_test.cpp \ include $(CLEAR_VARS) LOCAL_MODULE := kernel-config-unit-tests -- cgit v1.2.3