From 21cfdb8e751c4d24d7d274dd48946eb0112006ad Mon Sep 17 00:00:00 2001 From: Bertrand SIMONNET Date: Mon, 14 Dec 2015 15:55:49 -0800 Subject: libbrillo: Fix unit tests. We are using stat in the unit tests which is available under two different path on Chromium OS (/usr/bin/stat) and Android (/system/bin/stat). Bug: 26181888 Test: unit tests pass on Android. Test: unit tests pass on Chromium OS. Change-Id: I9374e1d8b962b7cf310bbba15adab9d99804c5a5 --- brillo/process_unittest.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/brillo/process_unittest.cc b/brillo/process_unittest.cc index de6cd72..0f4436e 100644 --- a/brillo/process_unittest.cc +++ b/brillo/process_unittest.cc @@ -20,8 +20,10 @@ using base::FilePath; // This test assumes the following standard binaries are installed. #if defined(__ANDROID__) # define SYSTEM_PREFIX "/system" +static const char kBinStat[] = SYSTEM_PREFIX "/bin/stat"; #else # define SYSTEM_PREFIX "" +static const char kBinStat[] = "/usr/bin/stat"; #endif static const char kBinSh[] = SYSTEM_PREFIX "/bin/sh"; @@ -30,7 +32,6 @@ static const char kBinCp[] = SYSTEM_PREFIX "/bin/cp"; static const char kBinEcho[] = SYSTEM_PREFIX "/bin/echo"; static const char kBinFalse[] = SYSTEM_PREFIX "/bin/false"; static const char kBinSleep[] = SYSTEM_PREFIX "/bin/sleep"; -static const char kBinStat[] = SYSTEM_PREFIX "/usr/bin/stat"; static const char kBinTrue[] = SYSTEM_PREFIX "/bin/true"; namespace brillo { -- cgit v1.2.3