From 9be08711fe5eef7f54611729fce5ff159f17a230 Mon Sep 17 00:00:00 2001
From: Martin Cermak <mcermak@redhat.com>
Date: Wed, 21 Jan 2015 18:29:48 +0100
Subject: [PATCH] PR17864: Fix alias_tapset.exp regression

* Take only interesting parts of the stap output into account
  so that expect's match_max doesn't get exceeded.
* Adapt the testcase to commit befbf100 which modifies
  syscall.read on s390x
---
 testsuite/systemtap.base/alias_tapset.exp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testsuite/systemtap.base/alias_tapset.exp b/testsuite/systemtap.base/alias_tapset.exp
index 82b14207c..391c9947e 100644
--- a/testsuite/systemtap.base/alias_tapset.exp
+++ b/testsuite/systemtap.base/alias_tapset.exp
@@ -7,7 +7,7 @@ set never_found 0
 set kernel_function_found 0
 set timer_found 0
 
-set cmd "stap -p2 -I $srcdir/$subdir/${test} $srcdir/$subdir/${test}.stp"
+set cmd "bash -c {stap -p2 -I $srcdir/$subdir/${test} $srcdir/$subdir/${test}.stp | egrep '^kernel|^never|^timer'}"
 verbose -log "running $cmd"
 eval spawn $cmd
 expect {
@@ -25,7 +25,7 @@ catch { close }
 # get the return code of the process
 set rc [lindex [wait -i $spawn_id] 3]
 
-if { $rc == 0 && $never_found == 1 && $kernel_function_found == 1
+if { $rc == 0 && $never_found == 1 && $kernel_function_found >= 1
      && $timer_found == 1 } {
     pass $test
 } else {
-- 
2.43.5