From d25a778b9f1d95972cc6197431684411a035f351 Mon Sep 17 00:00:00 2001
From: Daniel Nichter <daniel@percona.com>
Date: Fri, 14 Dec 2012 12:14:12 -0700
Subject: [PATCH] Fix two possible sources of test errors.

---
 t/lib/bash/collect_system_info.sh | 4 ++--
 t/pt-table-checksum/issue_388.t   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/t/lib/bash/collect_system_info.sh b/t/lib/bash/collect_system_info.sh
index c8bded5d..9de87fec 100644
--- a/t/lib/bash/collect_system_info.sh
+++ b/t/lib/bash/collect_system_info.sh
@@ -267,7 +267,7 @@ test_propietary_raid_controller "$PT_TMPDIR/raid_controller"
 ) 2>/dev/null &
 forked_pid="$!"
 
-if [ -e /proc/$forked_pid/oom_adj ] \
+if [ -w /proc/$forked_pid/oom_adj ] \
       && echo "-17" > /proc/$forked_pid/oom_adj 2>/dev/null; then
 
    notable_processes_info > "$PT_TMPDIR/notable_procs"
@@ -277,7 +277,7 @@ if [ -e /proc/$forked_pid/oom_adj ] \
       "notable_proccesses_info finds the process we manually changed earlier"
 
 else
-   skip 1 1 "Either this OS doesn't have an oom, or this user doesn't have enough privileges to change the oom of other processes"
+   skip 1 1 "oom_adj doesn't exist or isn't writeable"
 fi
 
 disown $forked_pid
diff --git a/t/pt-table-checksum/issue_388.t b/t/pt-table-checksum/issue_388.t
index 1f248e69..d348d157 100644
--- a/t/pt-table-checksum/issue_388.t
+++ b/t/pt-table-checksum/issue_388.t
@@ -45,6 +45,7 @@ $dbh->do("insert into test.foo values (null, 'john, smith')");
 
 $output = output(
    sub { pt_table_checksum::main(@args, qw(-d test)) },
+   stderr => 1,
 );
 
 unlike(