public inbox for util-linux@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] tests: lscpu: add CPU max MHz to test results
@ 2013-09-10 19:51 Sami Kerola
  2013-09-10 19:51 ` [PATCH 2/2] rev: fix new line regression Sami Kerola
  2013-09-12  9:05 ` [PATCH 1/2] tests: lscpu: add CPU max MHz to test results Karel Zak
  0 siblings, 2 replies; 4+ messages in thread
From: Sami Kerola @ 2013-09-10 19:51 UTC (permalink / raw)
  To: util-linux; +Cc: kerolasa

Commit 44320710bdb98a3036e8297d0e0af043fb72d702 changed default output.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 tests/expected/lscpu/lscpu-armv7             | 1 +
 tests/expected/lscpu/lscpu-x86_64-64cpu      | 1 +
 tests/expected/lscpu/lscpu-x86_64-dell_e4310 | 1 +
 3 files changed, 3 insertions(+)

diff --git a/tests/expected/lscpu/lscpu-armv7 b/tests/expected/lscpu/lscpu-armv7
index a1b691c..373e115 100644
--- a/tests/expected/lscpu/lscpu-armv7
+++ b/tests/expected/lscpu/lscpu-armv7
@@ -3,6 +3,7 @@ On-line CPU(s) list:   0,1
 Thread(s) per core:    1
 Core(s) per socket:    2
 Socket(s):             1
+CPU max MHz:           1700.0000
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
diff --git a/tests/expected/lscpu/lscpu-x86_64-64cpu b/tests/expected/lscpu/lscpu-x86_64-64cpu
index 45890b5..db625cf 100644
--- a/tests/expected/lscpu/lscpu-x86_64-64cpu
+++ b/tests/expected/lscpu/lscpu-x86_64-64cpu
@@ -11,6 +11,7 @@ Model:                 46
 Model name:            Intel(R) Xeon(R) CPU           X7550  @ 2.00GHz
 Stepping:              6
 CPU MHz:               1064.000
+CPU max MHz:           1996.0000
 BogoMIPS:              3989.44
 Virtualization:        VT-x
 L1d cache:             32K
diff --git a/tests/expected/lscpu/lscpu-x86_64-dell_e4310 b/tests/expected/lscpu/lscpu-x86_64-dell_e4310
index a81878d..2506c9b 100644
--- a/tests/expected/lscpu/lscpu-x86_64-dell_e4310
+++ b/tests/expected/lscpu/lscpu-x86_64-dell_e4310
@@ -11,6 +11,7 @@ Model:                 37
 Model name:            Intel(R) Core(TM) i5 CPU       M 560  @ 2.67GHz
 Stepping:              5
 CPU MHz:               1199.000
+CPU max MHz:           2667.0000
 BogoMIPS:              5319.97
 Virtualization:        VT-x
 L1d cache:             32K
-- 
1.8.4


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] rev: fix new line regression
  2013-09-10 19:51 [PATCH 1/2] tests: lscpu: add CPU max MHz to test results Sami Kerola
@ 2013-09-10 19:51 ` Sami Kerola
  2013-09-12  9:06   ` Karel Zak
  2013-09-12  9:05 ` [PATCH 1/2] tests: lscpu: add CPU max MHz to test results Karel Zak
  1 sibling, 1 reply; 4+ messages in thread
From: Sami Kerola @ 2013-09-10 19:51 UTC (permalink / raw)
  To: util-linux; +Cc: kerolasa

Commit 4b4eb34004378fe70259acd8f2f859e7b5cc3726 made output incorrect for
input lines that does not have new line.  For example

$ printf "a b c\n1 2 3" | rev
c b a
 2 13

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 text-utils/rev.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/text-utils/rev.c b/text-utils/rev.c
index 85e1630..f1341cb 100644
--- a/text-utils/rev.c
+++ b/text-utils/rev.c
@@ -163,7 +163,9 @@ int main(int argc, char *argv[])
 
 				len = wcslen(buf);
 			}
-			reverse_str(buf, len - 1);
+			if (buf[len - 1] == '\n')
+				buf[len--] = '\0';
+			reverse_str(buf, len);
 			fputws(buf, stdout);
 		}
 		if (ferror(fp)) {
-- 
1.8.4


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] tests: lscpu: add CPU max MHz to test results
  2013-09-10 19:51 [PATCH 1/2] tests: lscpu: add CPU max MHz to test results Sami Kerola
  2013-09-10 19:51 ` [PATCH 2/2] rev: fix new line regression Sami Kerola
@ 2013-09-12  9:05 ` Karel Zak
  1 sibling, 0 replies; 4+ messages in thread
From: Karel Zak @ 2013-09-12  9:05 UTC (permalink / raw)
  To: Sami Kerola; +Cc: util-linux

On Tue, Sep 10, 2013 at 08:51:13PM +0100, Sami Kerola wrote:
>  tests/expected/lscpu/lscpu-armv7             | 1 +
>  tests/expected/lscpu/lscpu-x86_64-64cpu      | 1 +
>  tests/expected/lscpu/lscpu-x86_64-dell_e4310 | 1 +
>  3 files changed, 3 insertions(+)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] rev: fix new line regression
  2013-09-10 19:51 ` [PATCH 2/2] rev: fix new line regression Sami Kerola
@ 2013-09-12  9:06   ` Karel Zak
  0 siblings, 0 replies; 4+ messages in thread
From: Karel Zak @ 2013-09-12  9:06 UTC (permalink / raw)
  To: Sami Kerola; +Cc: util-linux

On Tue, Sep 10, 2013 at 08:51:14PM +0100, Sami Kerola wrote:
>  text-utils/rev.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-09-12  9:06 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-10 19:51 [PATCH 1/2] tests: lscpu: add CPU max MHz to test results Sami Kerola
2013-09-10 19:51 ` [PATCH 2/2] rev: fix new line regression Sami Kerola
2013-09-12  9:06   ` Karel Zak
2013-09-12  9:05 ` [PATCH 1/2] tests: lscpu: add CPU max MHz to test results Karel Zak

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox