From fc97889b2d8e0a96b578fa5b97c6ef649682adb9 Mon Sep 17 00:00:00 2001
From: Craig Small <csmall@dropbear.xyz>
Date: Mon, 29 Mar 2021 22:23:03 +1100
Subject: [PATCH] build-sys: Handle zero length diskstats in tests

vmstat -d testsuite will fail if your /proc/diskstats is present
but zero length. While this seems buggy behaviour from lxcfs, its
there and its a simple matter to test for it and skip those tests
if we are run on a zero length /proc/diskstats system.
---
 testsuite/vmstat.test/vmstat.exp | 33 +++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/testsuite/vmstat.test/vmstat.exp b/testsuite/vmstat.test/vmstat.exp
index b044903b..cd55e529 100644
--- a/testsuite/vmstat.test/vmstat.exp
+++ b/testsuite/vmstat.test/vmstat.exp
@@ -35,20 +35,23 @@ set test "vmstat disk information (-d option)"
 if { [ file readable "/sys/block" ] == 0 }  {
     unsupported "$test /sys/block not readable"
 } else {
-    spawn $vmstat -d
-    expect_pass "$test" "^disk\[ -\]+reads\[ -\]+writes\[ -\]+IO\[ -\]+\\s+total\\s+merged\\s+sectors\\s+ms\\s+total\\s+merged\\s+sectors\\s+ms\\s+cur\\s+sec\\s+"
-}
+    set fp [open /proc/diskstats ]
+    if { [ read $fp ] == "" } {
+	close $fp
+        unsupported "$test /proc/diskstats empty"
+    } else {
+        close $fp
+        spawn $vmstat -d
+        expect_pass "$test" "^disk\[ -\]+reads\[ -\]+writes\[ -\]+IO\[ -\]+\\s+total\\s+merged\\s+sectors\\s+ms\\s+total\\s+merged\\s+sectors\\s+ms\\s+cur\\s+sec\\s+"
 
-# Need a partition
-set diskstats [ exec cat /proc/diskstats ]
-if { [ file readable "/sys/block" ] == 0 }  {
-    unsupported "vmstat partition /sys/block not readable"
-} else {
-  if [ regexp "\\s+\\d+\\s+\\d+\\s+\((?:hd|sd|vd)\[a-z\]\\d+\)\\s+\[0-9\]\[0-9\]+" $diskstats line partition == 1 ] {
-      set test "vmstat partition (using $partition)"
-      spawn $vmstat -p $partition
-      expect_pass "$test" "^${partition}\\s+reads"
-  } else {
-      unsupported "vmstat partition (cannot find partition)"
-  }
+	# Need a partition
+        set diskstats [ exec cat /proc/diskstats ]
+        if [ regexp "\\s+\\d+\\s+\\d+\\s+\((?:hd|sd|vd)\[a-z\]\\d+\)\\s+\[0-9\]\[0-9\]+" $diskstats line partition == 1 ] {
+            set test "vmstat partition (using $partition)"
+            spawn $vmstat -p $partition
+            expect_pass "$test" "^${partition}\\s+reads"
+        } else {
+            unsupported "vmstat partition (cannot find partition)"
+        }
+    }
 }