diff options
| author | David Smith <dsmith@redhat.com> | 2010-02-02 16:14:39 -0600 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2010-02-02 16:14:39 -0600 |
| commit | fff4e6c6e4bb5bd1046164d697872f0bc1a48f4c (patch) | |
| tree | ebfb0bfe169101eba8ee3be8fc4eda1df4847f59 | |
| parent | 1c64350c56271d1dee13f813aa8c78ece33e3cd5 (diff) | |
| download | systemtap-steved-fff4e6c6e4bb5bd1046164d697872f0bc1a48f4c.tar.gz systemtap-steved-fff4e6c6e4bb5bd1046164d697872f0bc1a48f4c.tar.xz systemtap-steved-fff4e6c6e4bb5bd1046164d697872f0bc1a48f4c.zip | |
Fix procfs_write.exp so that it will pass under RHELl5.
* testsuite/systemtap.base/procfs_write.exp: Small changes for RHEL5
support.
* testsuite/lib/stap_run.exp (stap_run): Increase maximum number of
characters to match against.
| -rw-r--r-- | testsuite/lib/stap_run.exp | 4 | ||||
| -rw-r--r-- | testsuite/systemtap.base/procfs_write.exp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp index 9d271ca1..42ea09c9 100644 --- a/testsuite/lib/stap_run.exp +++ b/testsuite/lib/stap_run.exp @@ -57,6 +57,10 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args } # check the output to see if it is sane set output "^systemtap ending probe\r\n$OUTPUT_CHECK_STRING" + # By default, "expect -re" will match up to 2000 chars. + # Increase this to 8K worth of data. + exp_match_max 8192 + expect { -timeout 20 -re $warning_regexp { diff --git a/testsuite/systemtap.base/procfs_write.exp b/testsuite/systemtap.base/procfs_write.exp index 5bb35532..68338b8c 100644 --- a/testsuite/systemtap.base/procfs_write.exp +++ b/testsuite/systemtap.base/procfs_write.exp @@ -96,8 +96,8 @@ set test_string \ # Now we need the version of the above string that expect will look # for. So, we need to convert all '\n' to '\r\n' and add a trailing # '\r\n'. -regsub -all {\n} $test_string {\r\n} test_string2 -set test_string2 "$test_string2\\r\\n" +regsub -all {\n} $test_string "\r\n" test_string2 +set test_string2 "$test_string2\r\n" proc proc_write_test {} { global test test_string |