commit 346c43baf2d0c58d4d96df8c5c5366eb9923d45d
author Bertrand SIMONNET <bsimonnet@chromium.org> Wed Jul 09 09:31:42 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Jul 09 20:30:03 2014 +0000
tree eb386c39fa97eb18825b3c18e967cb56e654757b
parent 46b49da5ad156911cf17aa79f373d90595063ba0

metrics: fix unittest

This fixes a compilation bug that was not caught because of crbug.com/392504.

BUG=chromium:392504
TEST=FEATURES=test emerge-amd64-generic metrics

Change-Id: Id71a8945d1ec80c7e5d7f2d8de5d287321b47de7
Reviewed-on: https://chromium-review.googlesource.com/207131
Reviewed-by: Luigi Semenzato <semenzato@chromium.org>
Commit-Queue: Bertrand Simonnet <bsimonnet@chromium.org>
Tested-by: Bertrand Simonnet <bsimonnet@chromium.org>

metrics/metrics_daemon_test.cc

diff --git a/metrics/metrics_daemon_test.cc b/metrics/metrics_daemon_test.cc
index 3973ecb..4f2741b 100644
--- a/metrics/metrics_daemon_test.cc
+++ b/metrics/metrics_daemon_test.cc
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#define __STDC_FORMAT_MACROS
+
+#include <inttypes.h>
 #include <utime.h>
 
 #include <string>
@@ -33,12 +36,12 @@
 
 static const char kFakeDiskStatsName[] = "fake-disk-stats";
 static const char kFakeDiskStatsFormat[] =
-    "    1793     1788    %d   105580    "
-    "    196      175     %d    30290    "
+    "    1793     1788    %" PRIu64 "d   105580    "
+    "    196      175     %" PRIu64 "d    30290    "
     "    0    44060   135850\n";
 static string kFakeDiskStats[2];
-static const int kFakeReadSectors[] = {80000, 100000};
-static const int kFakeWriteSectors[] = {3000, 4000};
+static const uint64 kFakeReadSectors[] = {80000, 100000};
+static const uint64 kFakeWriteSectors[] = {3000, 4000};
 
 static const char kFakeVmStatsName[] = "fake-vm-stats";
 static const char kFakeScalingMaxFreqPath[] = "fake-scaling-max-freq";
@@ -254,7 +257,7 @@
 }
 
 TEST_F(MetricsDaemonTest, ReportDiskStats) {
-  long int read_sectors_now, write_sectors_now;
+  uint64 read_sectors_now, write_sectors_now;
 
   CreateFakeDiskStatsFile(kFakeDiskStats[1].c_str());
   daemon_.DiskStatsReadStats(&read_sectors_now, &write_sectors_now);