Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cab59654 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Stop using __STRING unnecessarily." 

am: a59ecfd9

Change-Id: I4ec31b93772bd1740338c7e9f7e3aba9f14ac602
parents deb18f53 a59ecfd9

logcat/tests/logcat_test.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -1404,7 +1404,7 @@ TEST(logcat, regex) { 
    int count = 0;

    int count = 0;





    char buffer[BIG_BUFFER];

    char buffer[BIG_BUFFER];

#define logcat_regex_prefix ___STRING(logcat) "_test"

#define logcat_regex_prefix logcat_executable "_test"





    snprintf(buffer, sizeof(buffer),

    snprintf(buffer, sizeof(buffer),

             logcat_executable " --pid %d -d -e " logcat_regex_prefix "_a+b",

             logcat_executable " --pid %d -d -e " logcat_regex_prefix "_a+b",
@@ -1550,7 +1550,7 @@ TEST(logcat, descriptive) { 




    {

    {

        static const struct tag sync = { 2720, "sync" };

        static const struct tag sync = { 2720, "sync" };

        static const char id[] = ___STRING(logcat) ".descriptive-sync";

        static const char id[] = logcat_executable ".descriptive-sync";

        {

        {

            android_log_event_list ctx(sync.tagNo);

            android_log_event_list ctx(sync.tagNo);

            ctx << id << (int32_t)42 << (int32_t)-1 << (int32_t)0;

            ctx << id << (int32_t)42 << (int32_t)-1 << (int32_t)0;
@@ -1665,7 +1665,7 @@ TEST(logcat, descriptive) { 
        // Invent new entries because existing can not serve

        // Invent new entries because existing can not serve

        EventTagMap* map = android_openEventTagMap(nullptr);

        EventTagMap* map = android_openEventTagMap(nullptr);

        ASSERT_TRUE(nullptr != map);

        ASSERT_TRUE(nullptr != map);

        static const char name[] = ___STRING(logcat) ".descriptive-monotonic";

        static const char name[] = logcat_executable ".descriptive-monotonic";

        int myTag = android_lookupEventTagNum(map, name, "(new|1|s)",

        int myTag = android_lookupEventTagNum(map, name, "(new|1|s)",

                                              ANDROID_LOG_UNKNOWN);

                                              ANDROID_LOG_UNKNOWN);

        android_closeEventTagMap(map);

        android_closeEventTagMap(map);