diff options
| -rw-r--r-- | examples/cut_here.right | 1 | ||||
| -rwxr-xr-x | examples/test.sh | 2 | ||||
| -rw-r--r-- | lib/Plugins/KerneloopsSysLog.cpp | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/examples/cut_here.right b/examples/cut_here.right index b12195e3..b5970f03 100644 --- a/examples/cut_here.right +++ b/examples/cut_here.right @@ -1,7 +1,6 @@ dumpoops: found oopses: 1 Version: 2.6.32-19.el6.x86_64 -------------[ cut here ]------------ WARNING: at arch/x86/kernel/cpu/mtrr/generic.c:467 generic_get_mtrr+0x11e/0x140() (Not tainted) Hardware name: ProLiant BL460c G1 diff --git a/examples/test.sh b/examples/test.sh index cedc0766..6c704faa 100755 --- a/examples/test.sh +++ b/examples/test.sh @@ -1,7 +1,7 @@ for f in *.test; do b="${f%%.test}" dumpoops -s "$f" >"$b".out 2>&1 - if diff "$b".out "$b".right >"$b".diff 2>&1; then + if diff -u "$b".right "$b".out >"$b".diff 2>&1; then rm "$b".out "$b".diff fi done diff --git a/lib/Plugins/KerneloopsSysLog.cpp b/lib/Plugins/KerneloopsSysLog.cpp index 2dd5f804..66cce416 100644 --- a/lib/Plugins/KerneloopsSysLog.cpp +++ b/lib/Plugins/KerneloopsSysLog.cpp @@ -240,8 +240,10 @@ next_line: oopsstart = i; else if (strstr(curline, "INFO: possible recursive locking detected")) oopsstart = i; - else if (strstr(curline, "------------[ cut here ]------------")) - oopsstart = i; + // Not needed: "--[ cut here ]--" is always followed + // by "Badness at", "kernel BUG at", or "WARNING: at" string + //else if (strstr(curline, "------------[ cut here ]------------")) + // oopsstart = i; else if (strstr(curline, "list_del corruption.")) oopsstart = i; else if (strstr(curline, "list_add corruption.")) |