diff options
| author | Bertrand SIMONNET <bsimonnet@google.com> | 2015-12-14 15:55:49 -0800 |
|---|---|---|
| committer | Bertrand SIMONNET <bsimonnet@google.com> | 2015-12-14 15:58:23 -0800 |
| commit | 21cfdb8e751c4d24d7d274dd48946eb0112006ad (patch) | |
| tree | 5cca22e4567c57a769e3e7a44fe03402de1c6ef6 | |
| parent | 88a74f9b14726d6192b69fe64bb8dd6301b6125e (diff) | |
| download | platform_external_libbrillo-21cfdb8e751c4d24d7d274dd48946eb0112006ad.tar.gz platform_external_libbrillo-21cfdb8e751c4d24d7d274dd48946eb0112006ad.tar.bz2 platform_external_libbrillo-21cfdb8e751c4d24d7d274dd48946eb0112006ad.zip | |
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
| -rw-r--r-- | brillo/process_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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 { |