summaryrefslogtreecommitdiffstats
path: root/tools/testing
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2014-11-23 15:13:44 -0500
committerSteven Rostedt <rostedt@goodmis.org>2014-11-23 15:13:44 -0500
commit17150fef4ab1f48d838008657cdaa168453a9fa6 (patch)
treeccf638d695df62d6efaafbfbed91e6038baf3f43 /tools/testing
parent18656c7099c627bdf8579b21dea512e0a8addbb9 (diff)
downloadlinux-17150fef4ab1f48d838008657cdaa168453a9fa6.tar.gz
linux-17150fef4ab1f48d838008657cdaa168453a9fa6.tar.bz2
linux-17150fef4ab1f48d838008657cdaa168453a9fa6.zip
ktest: Add back "tail -1" to kernelrelease make
Commit 52d21580b362 "ktest: Use make -s kernelrelease" fixed commit 7ff525712acf "kbuild: fake the "Entering directory ..." message more simply" as that commit added output after the make kernelrelease. But there's still some build scripts that are used by ktest that has output before the make is executed, and requires that only the last line is printed. Cc: Michal Marek <mmarek@suse.cz> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'tools/testing')
-rwxr-xr-xtools/testing/ktest/ktest.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 35b118a38c2f..b9cd036f0442 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -2002,7 +2002,7 @@ sub get_version {
# get the release name
return if ($have_version);
doprint "$make kernelrelease ... ";
- $version = `$make -s kernelrelease`;
+ $version = `$make -s kernelrelease | tail -1`;
chomp($version);
doprint "$version\n";
$have_version = 1;