All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 06/16] trace: Improve the trace test number recognition
Date: Sun, 14 Feb 2016 18:36:50 -0700	[thread overview]
Message-ID: <1455500220-1324-7-git-send-email-sjg@chromium.org> (raw)
In-Reply-To: <1455500220-1324-1-git-send-email-sjg@chromium.org>

The awk tool can be confused by return character (ASCII 13) in its input
since it thinks there is a separate field. These can appear if the terminal
is in raw mode, perhaps due to a previous U-Boot crash with sandbox. This
is very confusing. Remove these so that the trace test passes.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 test/trace/test-trace.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/trace/test-trace.sh b/test/trace/test-trace.sh
index 3e8651e..746793c 100755
--- a/test/trace/test-trace.sh
+++ b/test/trace/test-trace.sh
@@ -45,7 +45,9 @@ check_results() {
 	# between calls 2 and 3, where tracing is paused.
 	# This code gets the sign of the difference between each number and
 	# its predecessor.
-	counts="$(tr -d , <${tmp} | awk '/traced function calls/ { diff = $1 - upto; upto = $1; printf "%d ", diff < 0 ? -1 : (diff > 0 ? 1 : 0)}')"
+	counts="$(tr -d ',\r' <${tmp} | awk \
+		'/traced function calls/ { diff = $1 - upto; upto = $1; \
+		printf "%d ", diff < 0 ? -1 : (diff > 0 ? 1 : 0)}')"
 
 	if [ "${counts}" != "1 1 0 1 " ]; then
 		fail "trace collection error: ${counts}"
-- 
2.7.0.rc3.207.g0ac5344

  parent reply	other threads:[~2016-02-15  1:36 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-15  1:36 [U-Boot] [PATCH 00/16] image: Fix various test failures Simon Glass
2016-02-15  1:36 ` [U-Boot] [PATCH 01/16] image: Correct the OS location code to work on sandbox Simon Glass
2016-02-15  1:36 ` [U-Boot] [PATCH 02/16] Revert "image-fit: Fix signature checking" Simon Glass
2016-02-15  1:36 ` [U-Boot] [PATCH 03/16] image: Fix FIT and vboot tests to exit sandbox correctly Simon Glass
2016-02-15  1:36 ` [U-Boot] [PATCH 04/16] trace: Fix compiler warnings in trace Simon Glass
2016-02-16  9:21   ` Bin Meng
2016-02-15  1:36 ` [U-Boot] [PATCH 05/16] lib: Don't instrument the div64 function Simon Glass
2016-02-16  9:21   ` Bin Meng
2016-02-15  1:36 ` Simon Glass [this message]
2016-02-15  1:36 ` [U-Boot] [PATCH 07/16] timer: Support tracing fully Simon Glass
2016-02-16  9:21   ` Bin Meng
2016-02-23  6:37     ` Simon Glass
2016-02-15  1:36 ` [U-Boot] [PATCH 08/16] timer: Provide an early timer Simon Glass
2016-02-16  9:21   ` Bin Meng
2016-02-23  6:37     ` Simon Glass
2016-02-15  1:36 ` [U-Boot] [PATCH 09/16] timer: Set up the real timer after driver model is available Simon Glass
2016-02-16  9:21   ` Bin Meng
2016-02-15  1:36 ` [U-Boot] [PATCH 10/16] sandbox: timer: Support the early timer Simon Glass
2016-02-16  9:22   ` Bin Meng
2016-02-23  6:37     ` Simon Glass
2016-02-15  1:36 ` [U-Boot] [PATCH 11/16] sandbox: Correct ordering of defconfig Simon Glass
2016-02-15  1:36 ` [U-Boot] [PATCH 12/16] sandbox: Enable the early timer Simon Glass
2016-02-16  9:22   ` Bin Meng
2016-02-15  1:36 ` [U-Boot] [PATCH 13/16] sandbox: spi: Add more debugging to SPI emulation Simon Glass
2016-02-15 19:01   ` Jagan Teki
2016-02-15  1:36 ` [U-Boot] [PATCH 14/16] sandbox: spi: Remove an incorrect free() Simon Glass
2016-02-15 19:02   ` Jagan Teki
2016-02-15 22:37   ` Tom Rini
2016-02-15  1:36 ` [U-Boot] [PATCH 15/16] spi: Correct two error return values Simon Glass
2016-02-15 19:10   ` Jagan Teki
2016-02-15  1:37 ` [U-Boot] [PATCH 16/16] spi: Re-enable the SPI flash tests Simon Glass
2016-02-15 19:10   ` Jagan Teki
2016-02-16 22:03 ` [U-Boot] [PATCH 00/16] image: Fix various test failures Stephen Warren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1455500220-1324-7-git-send-email-sjg@chromium.org \
    --to=sjg@chromium.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.