ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "liblog: test: CTS: enoent does not qualify" am: 34cfb3cbc6 am: 89df1a124e

Browse source 
am: 65e4eaa216

Change-Id: Ifb79cbd529edde0c261af39d8b3890d86f82d89c
This commit is contained in:
Mark Salyzyn 2017-05-25 17:55:49 +00:00 • committed by android-build-merger
commit a06e0e067e
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
liblog/tests/liblog_test.cpp
View file

@ -1720,6 +1720,7 @@ TEST(liblog, is_loggable) {
// Kills logd and toss all collected data, equivalent to logcat -b all -c,
// except we also return errors to the logging callers.
#ifdef USING_LOGGER_DEFAULT
#ifdef __ANDROID__
#ifdef TEST_PREFIX
// helper to liblog.enoent to count end-to-end matching logging messages.
static int count_matching_ts(log_time ts) {
@ -1832,7 +1833,8 @@ TEST(liblog, enoent) {
GTEST_LOG_(INFO) << "This test does nothing.\n";
#endif
}
#endif // USING_LOCAL_LOGD
#endif // __ANDROID__
#endif // USING_LOGGER_DEFAULT
// Below this point we run risks of setuid(AID_SYSTEM) which may affect others.