* [for-linus][PATCH 0/2] ktest: A couple more updates before asking for a pull request
@ 2020-08-10 18:28 Steven Rostedt
2020-08-10 18:28 ` [for-linus][PATCH 1/2] ktest.pl: Change the logic to control the size of the log file emailed Steven Rostedt
2020-08-10 18:28 ` [for-linus][PATCH 2/2] ktest.pl: Fix spelling mistake "Cant" -> "Cant" Steven Rostedt
0 siblings, 2 replies; 3+ messages in thread
From: Steven Rostedt @ 2020-08-10 18:28 UTC (permalink / raw)
To: linux-kernel; +Cc: John Warthog9 Hawley
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git
for-next
Head SHA1: ff131efff141fc679cccde28bc265f4c79cbe329
Colin Ian King (1):
ktest.pl: Fix spelling mistake "Cant" -> "Can't"
Steven Rostedt (VMware) (1):
ktest.pl: Change the logic to control the size of the log file emailed
----
tools/testing/ktest/ktest.pl | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [for-linus][PATCH 1/2] ktest.pl: Change the logic to control the size of the log file emailed
2020-08-10 18:28 [for-linus][PATCH 0/2] ktest: A couple more updates before asking for a pull request Steven Rostedt
@ 2020-08-10 18:28 ` Steven Rostedt
2020-08-10 18:28 ` [for-linus][PATCH 2/2] ktest.pl: Fix spelling mistake "Cant" -> "Cant" Steven Rostedt
1 sibling, 0 replies; 3+ messages in thread
From: Steven Rostedt @ 2020-08-10 18:28 UTC (permalink / raw)
To: linux-kernel; +Cc: John Warthog9 Hawley
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
If the log file for a given test is larger than the max size given then use
set the seek from the end of the log file instead of from the start of the
test.
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
tools/testing/ktest/ktest.pl | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 36db5b0b3647..9363a5b27339 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1499,18 +1499,21 @@ sub dodie {
my $log_file;
if (defined($opt{"LOG_FILE"})) {
- my $size = 0;
+ my $whence = 0; # beginning of file
+ my $pos = $test_log_start;
+
if (defined($mail_max_size)) {
my $log_size = tell LOG;
$log_size -= $test_log_start;
if ($log_size > $mail_max_size) {
- $size = $log_size - $mail_max_size;
+ $whence = 2; # end of file
+ $pos = - $mail_max_size;
}
}
$log_file = "$tmpdir/log";
open (L, "$opt{LOG_FILE}") or die "Can't open $opt{LOG_FILE} to read)";
open (O, "> $tmpdir/log") or die "Can't open $tmpdir/log\n";
- seek(L, $test_log_start + $size, 0);
+ seek(L, $pos, $whence);
while (<L>) {
print O;
}
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [for-linus][PATCH 2/2] ktest.pl: Fix spelling mistake "Cant" -> "Cant"
2020-08-10 18:28 [for-linus][PATCH 0/2] ktest: A couple more updates before asking for a pull request Steven Rostedt
2020-08-10 18:28 ` [for-linus][PATCH 1/2] ktest.pl: Change the logic to control the size of the log file emailed Steven Rostedt
@ 2020-08-10 18:28 ` Steven Rostedt
1 sibling, 0 replies; 3+ messages in thread
From: Steven Rostedt @ 2020-08-10 18:28 UTC (permalink / raw)
To: linux-kernel; +Cc: John Warthog9 Hawley, Colin Ian King
From: Colin Ian King <colin.king@canonical.com>
There is a spelling mistake in an error message. Fix it.
Link: https://lkml.kernel.org/r/20200810100750.61475-1-colin.king@canonical.com
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
tools/testing/ktest/ktest.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 9363a5b27339..cb16d2aac51c 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1543,7 +1543,7 @@ sub create_pty {
my $TIOCGPTN = 0x80045430;
sysopen($ptm, "/dev/ptmx", O_RDWR | O_NONBLOCK) or
- dodie "Cant open /dev/ptmx";
+ dodie "Can't open /dev/ptmx";
# unlockpt()
$tmp = pack("i", 0);
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-10 18:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-10 18:28 [for-linus][PATCH 0/2] ktest: A couple more updates before asking for a pull request Steven Rostedt
2020-08-10 18:28 ` [for-linus][PATCH 1/2] ktest.pl: Change the logic to control the size of the log file emailed Steven Rostedt
2020-08-10 18:28 ` [for-linus][PATCH 2/2] ktest.pl: Fix spelling mistake "Cant" -> "Cant" Steven Rostedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).