From 7284e8a650dc33304c1548a5b5f4b56d32cc1d1c Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Thu, 14 Dec 2017 15:05:18 +0000 Subject: [PATCH] Revert "Use std::fstream instead of rtc::File to write perf results + rename flag." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f711428898cb2f03d4d09738ba751cf0d316c631. Reason for revert: Breaks downstream projects. Original change's description: > Use std::fstream instead of rtc::File to write perf results + rename flag. > > Use std::fstream instead of rtc::File to write perf results. > On Android, when I use rtc::File, the results are not written for some reason. > > Also rename the flag to '--chartjson_result_file'. > > Bug: webrtc:8566 > Change-Id: I32215e2233e18690c41050dfd35ac77e01d11f35 > Reviewed-on: https://webrtc-review.googlesource.com/32001 > Reviewed-by: Patrik Höglund > Commit-Queue: Edward Lemur > Cr-Commit-Position: refs/heads/master@{#21225} TBR=phoglund@webrtc.org,ehmaldonado@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:8566 Change-Id: I55611592c3171152cee97e64bff35a0d62cea510 Reviewed-on: https://webrtc-review.googlesource.com/33080 Reviewed-by: Mirko Bonadei Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#21283} --- test/test_main.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/test_main.cc b/test/test_main.cc index c6c00c599d..5023ae6558 100644 --- a/test/test_main.cc +++ b/test/test_main.cc @@ -8,8 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include - +#include "rtc_base/file.h" #include "rtc_base/flags.h" #include "rtc_base/logging.h" #include "system_wrappers/include/metrics_default.h" @@ -36,7 +35,7 @@ DEFINE_string(force_fieldtrials, "", " will assign the group Enable to field trial WebRTC-FooFeature."); DEFINE_string( - chartjson_result_file, + perf_results_json_path, "", "Path where the perf results should be stored it the JSON format described " "by " @@ -74,12 +73,13 @@ int main(int argc, char* argv[]) { int exit_code = RUN_ALL_TESTS(); - std::string chartjson_result_file = FLAG_chartjson_result_file; - if (chartjson_result_file != "") { + std::string perf_results_json_path = FLAG_perf_results_json_path; + if (perf_results_json_path != "") { std::string json_results = webrtc::test::GetPerfResultsJSON(); - std::fstream json_file(chartjson_result_file, std::fstream::out); - json_file << json_results; - json_file.close(); + rtc::File json_file = rtc::File::Open(perf_results_json_path); + json_file.Write(reinterpret_cast(json_results.c_str()), + json_results.size()); + json_file.Close(); } return exit_code;