From 3d807ae853b8b4264da156065b34f1447658a8ba Mon Sep 17 00:00:00 2001
From: Craig Small <csmall@enc.com.au>
Date: Sat, 3 Dec 2011 00:32:14 +1100
Subject: [PATCH] Minor test fixes for non-linux

procps works well on Linux, on other arches there are some strange
differences due to their emulation of procfs which is not 100%
Disabling checks for non-linux until that can be sorted out.
---
 .gitignore                         |  2 ++
 configure.ac                       |  1 +
 testsuite/Makefile.am              | 10 +++++++---
 testsuite/free.test/free.exp       | 31 +++++++++++++++---------------
 testsuite/slabtop.test/slabtop.exp |  2 +-
 5 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index e9434796..ea304da7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,5 @@ vmstat
 w
 watch
 *~
+*.log
+*.sum
diff --git a/configure.ac b/configure.ac
index 3ab70930..f3c4e5e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,6 +118,7 @@ AC_ARG_ENABLE([kill],
   [], enable_kill=yes
 )
 AM_CONDITIONAL(BUILD_KILL, test "x$enable_kill" = xyes)
+AM_CONDITIONAL(LINUX, test "x$host_os" = xlinux-gnu)
 
 AC_ARG_ENABLE([oomem],
   AS_HELP_STRING([--enable-oomem], [add out-of-memory fields to the library and top]),
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 73df0c26..9374941e 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,17 +1,20 @@
 AUTOMAKE_OPTIONS = dejagnu
 export DEJAGNU
 
+if LINUX
+# Programs that are expected across the board
 DEJATOOL = \
 		   free \
-		   kill \
 		   pgrep \
 		   pkill \
-		   pmap \
 		   ps \
 		   pwdx \
 		   uptime \
 		   vmstat \
-		   w
+		   w \
+		   sysctl slabtop pmap kill
+
+endif
 		
 	
 EXTRA_DIST = \
@@ -29,4 +32,5 @@ EXTRA_DIST = \
 			 pwdx.test/pwdx.exp \
 			 global-conf.exp \
 			 sysctl.test/sysctl_read.exp \
+			 slabtop.test/slabtop.exp \
 			 vmstat.test/vmstat.exp
diff --git a/testsuite/free.test/free.exp b/testsuite/free.test/free.exp
index 6dace6e7..7c42d071 100644
--- a/testsuite/free.test/free.exp
+++ b/testsuite/free.test/free.exp
@@ -7,38 +7,39 @@ set meminfo [ exec cat /proc/meminfo ]
 regexp "MemTotal:\\s+\(\\d+\)" $meminfo -> memtotal_kb
 regexp "SwapTotal:\\s+\(\\d+\)" $meminfo -> swaptotal_kb
 
+set free_header "^\\s+total\\s+used\\s+free\\s+shared\\s+buffers\\s+cached\\s*"
 
 set test "free with no arguments"
-spawn free
-expect_pass "$test" "^\\s+total\\s+used\\s+free\\s+shared\\s+buffers\\s+cached\\s*Mem:\\s+${memtotal_kb}\\s+\\d+\\s+\\d+\\s+0\\s+\\d+\\s+\\d+\\s*-\\/\\+ buffers\\/cache:\\s+\\d+\\s+\\d+\\s*Swap:\\s+${swaptotal_kb}\\s+\\d+\\s+\\d+\\s*"
+spawn $free
+expect_pass "$test" "^${free_header}Mem:\\s+${memtotal_kb}\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s*-\\/\\+ buffers\\/cache:\\s+\\d+\\s+\\d+\\s*Swap:\\s+${swaptotal_kb}\\s+\\d+\\s+\\d+\\s*"
 
 set test "free with -b argument"
 set memtotal [ expr { $memtotal_kb * 1024 } ]
 set swaptotal [ expr { $swaptotal_kb * 1024 } ]
-spawn free -b
-expect_pass "$test" "^\\s+total\\s+used\\s+free\\s+shared\\s+buffers\\s+cached\\s*Mem:\\s+${memtotal}\\s+\\d+\\s+\\d+\\s+0\\s+\\d+\\s+\\d+\\s*-\\/\\+ buffers\\/cache:\\s+\\d+\\s+\\d+\\s*Swap:\\s+${swaptotal}\\s+\\d+\\s+\\d+\\s*"
+spawn $free -b
+expect_pass "$test" "${free_header}Mem:\\s+${memtotal}\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s*-\\/\\+ buffers\\/cache:\\s+\\d+\\s+\\d+\\s*Swap:\\s+${swaptotal}\\s+\\d+\\s+\\d+\\s*"
 
 foreach {arg divisor } {-k 1 -m 1024 -g 1048576 } {
     set test "free with $arg argument"
     set memtotal [ expr { $memtotal_kb / $divisor } ]
     set swaptotal [ expr { $swaptotal_kb / $divisor } ]
-    spawn free $arg
-    expect_pass "$test"  "^\\s+total\\s+used\\s+free\\s+shared\\s+buffers\\s+cached\\s*Mem:\\s+$memtotal\\s+\\d+\\s+\\d+\\s+0\\s+\\d+\\s+\\d+\\s*-\\/\\+ buffers\\/cache:\\s+\\d+\\s+\\d+\\s*Swap:\\s+${swaptotal}\\s+\\d+\\s+\\d+\\s*"
+    spawn $free $arg
+    expect_pass "$test"  "${free_header}Mem:\\s+$memtotal\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s*-\\/\\+ buffers\\/cache:\\s+\\d+\\s+\\d+\\s*Swap:\\s+${swaptotal}\\s+\\d+\\s+\\d+\\s*"
 }
 
-set test "free with human readable output"
-spawn free -h
-expect_pass "$test" "^\\s+total\\s+used\\s+free\\s+shared\\s+buffers\\s+cached\\s*Mem:\\s+\[0-9.\]+\[BKMGT\]\\s+\[0-9.\]+\[BKMGT\]\\s+\[0-9.\]+\[BKMGT\]\\s+\[0-9.\]+\[BKMGT\]\\s+\[0-9.\]+\[BKMGT\]\\s+\[0-9.\]+\[BKMGT\]\\s*-\\/\\+ buffers\\/cache:\\s+\[0-9.\]+\[BKMGT\]\\s+\[0-9.\]+\[BKMGT\]\\s*Swap:\\s+\[0-9.\]+\[BKMGT\]\\s+\[0-9.\]+\[BKMGT\]\\s+\[0-9.\]+\[BKMGT\]\\s*"
+#set test "free with human readable output"
+#spawn $free -h
+#expect_pass "$test" "${free_header}Mem:\\s+\[0-9.\]+\[BKMGT\]\\s+\[0-9.\]+\[BKMGT\]\\s+\[0-9.\]+\[BKMGT\]\\s+\[0-9.\]+\[BKMGT\]\\s+\[0-9.\]+\[BKMGT\]\\s+\[0-9.\]+\[BKMGT\]\\s*-\\/\\+ buffers\\/cache:\\s+\[0-9.\]+\[BKMGT\]\\s+\[0-9.\]+\[BKMGT\]\\s*Swap:\\s+\[0-9.\]+\[BKMGT\]\\s+\[0-9.\]+\[BKMGT\]\\s+\[0-9.\]+\[BKMGT\]\\s*"
 
 set test "free with lo and hi memory statistics"
-spawn free -l
-expect_pass "$test" "^\\s+total\\s+used\\s+free\\s+shared\\s+buffers\\s+cached\\s*Mem:\\s+\\d+\\s+\\d+\\s+\\d+\\s+0\\s+\\d+\\s+\\d+\\s*Low:\\s+\\d+\\s+\\d+\\s+\\d+\\s*High:\\s+\\d+\\s+\\d+\\s+\\d+\\s*-\\/\\+ buffers\\/cache:\\s+\\d+\\s+\\d+\\s*Swap:\\s+\\d+\\s+\\d+\\s+\\d+"
+spawn $free -l
+expect_pass "$test" "${free_header}Mem:\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s*Low:\\s+\\d+\\s+\\d+\\s+\\d+\\s*High:\\s+\\d+\\s+\\d+\\s+\\d+\\s*-\\/\\+ buffers\\/cache:\\s+\\d+\\s+\\d+\\s*Swap:\\s+\\d+\\s+\\d+\\s+\\d+"
 
 set test "free old argument"
-spawn free -o
-expect_pass "$test" "^\\s+total\\s+used\\s+free\\s+shared\\s+buffers\\s+cached\\s*Mem:\\s+\\d+\\s+\\d+\\s+\\d+\\s+0\\s+\\d+\\s+\\d+\\s*Swap:\\s+\\d+\\s+\\d+\\s+\\d+"
+spawn $free -o
+expect_pass "$test" "${free_header}Mem:\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s*Swap:\\s+\\d+\\s+\\d+\\s+\\d+"
 
 set test "free with total"
-spawn free -t
-expect_pass "$test" "^\\s+total\\s+used\\s+free\\s+shared\\s+buffers\\s+cached\\s*Mem:\\s+${memtotal_kb}\\s+\\d+\\s+\\d+\\s+0\\s+\\d+\\s+\\d+\\s*-\\/\\+ buffers\\/cache:\\s+\\d+\\s+\\d+\\s*Swap:\\s+${swaptotal_kb}\\s+\\d+\\s+\\d+\\s*Total:\\s+\\d+\\s+\\d+\\s+\\d+\\s*"
+spawn $free -t
+expect_pass "$test" "${free_header}Mem:\\s+${memtotal_kb}\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s*-\\/\\+ buffers\\/cache:\\s+\\d+\\s+\\d+\\s*Swap:\\s+${swaptotal_kb}\\s+\\d+\\s+\\d+\\s*Total:\\s+\\d+\\s+\\d+\\s+\\d+\\s*"
 
diff --git a/testsuite/slabtop.test/slabtop.exp b/testsuite/slabtop.test/slabtop.exp
index 92ca76c9..c1a3fbf3 100644
--- a/testsuite/slabtop.test/slabtop.exp
+++ b/testsuite/slabtop.test/slabtop.exp
@@ -11,7 +11,7 @@ set slabtop_header "^ $avst Objects $used \\d+ / \\d+ ${pct}\\s+$avst Slabs $use
 
 set test "slabtop help"
 spawn $slabtop --help
-expect_pass $test "usage: $slabtop \\\[options\\\]"
+expect_pass $test "usage: \\S+ \\\[options\\\]"
 
 set sort_tests {
     "a" "active objects" "^\\d+\\s+(\\d+)\\s+\\d+%\\s+\\d+\\.\\d+K\\s+\\d+\\s+\\d+\\s+\\d+K\\s+\\S\[^\r\]+\\s*"