diff options
| author | Evgeny Astigeevich <evgeny.astigeevich@linaro.org> | 2019-03-13 06:25:06 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-13 06:25:06 -0700 |
| commit | b6f42c3fa351cfd086f3bb6d4e91c6a7b3946dfa (patch) | |
| tree | 61a0f77ae882e3747bc92b01cc3f2aa5e193caaa | |
| parent | eced74dc5534de5a6de531e06c096d61f5842435 (diff) | |
| parent | 526336ed3a9258b9844ee25c30bf14f0efa64542 (diff) | |
| download | vixl-android10-qpr1-c-release.tar.gz | |
Fix MaskAddresses for toybox sed am: e1ac18930c am: e982a63b86android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
am: 526336ed3a
Change-Id: Id0b2d00f16f6bcf1730623fc22aa669dcd7f330d
| -rw-r--r-- | test/aarch64/test-trace-aarch64.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/test/aarch64/test-trace-aarch64.cc b/test/aarch64/test-trace-aarch64.cc index eac16c6b..e061e0cf 100644 --- a/test/aarch64/test-trace-aarch64.cc +++ b/test/aarch64/test-trace-aarch64.cc @@ -2739,21 +2739,14 @@ static void GenerateTestSequenceNEONFP(MacroAssembler* masm) { static void MaskAddresses(const char* trace) { -// Hexadecimal expressions of the form `\xab` do not work out-of-the box with -// BSD `sed`. So we use ANSI-C quoting to have the regular expressions below -// work both on Linux and BSD (and macOS). #ifdef __APPLE__ -#define MAYBE_ANSI_C_QUOTE "$" -#define HEX(val) "\\x" #val #define ESCAPE(c) "\\\\" #c const char* sed_options = "-i \"\" -E"; #else -#define MAYBE_ANSI_C_QUOTE -#define HEX(val) "\\x" #val #define ESCAPE(c) "\\" #c - const char* sed_options = "--in-place --regexp-extended"; + const char* sed_options = "-i -E"; #endif -#define COLOUR "(" HEX(1b) ESCAPE([) "[01];([0-9][0-9])?m)?" +#define COLOUR "(." ESCAPE([) "[01];([0-9][0-9])?m)?" struct { const char* search; const char* replace; @@ -2775,7 +2768,7 @@ static void MaskAddresses(const char* trace) { for (size_t i = 0; i < patterns_length; i++) { size_t length = snprintf(command, sizeof(command), - "sed %s " MAYBE_ANSI_C_QUOTE "'s/%s/%s/' '%s'", + "sed %s 's/%s/%s/' '%s'", sed_options, patterns[i].search, patterns[i].replace, |