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

Commit cbaa1c61 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

am 6ba4c9d9: am c78b33d0: Merge "split-select: fix OSX build" into lmp-mr1-dev automerge: be593a77 

* commit '6ba4c9d9':
  split-select: fix OSX build
parents 744300b7 6ba4c9d9

tools/split-select/TestRules.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -75,7 +75,7 @@ const Rule AlwaysTrue() { 
        const char*, const char*,

        const char*, const char*,

        const sp<Rule>& actual, const Rule& expected) {

        const sp<Rule>& actual, const Rule& expected) {

    const String8 expectedStr(expected.toJson());

    const String8 expectedStr(expected.toJson());

    const String8 actualStr(actual != NULL ? actual->toJson() : "");

    const String8 actualStr(actual != NULL ? actual->toJson() : String8());





    if (expectedStr != actualStr) {

    if (expectedStr != actualStr) {

        return ::testing::AssertionFailure()

        return ::testing::AssertionFailure()