From 268bebd4085c2d0400a0506c65802ad7d9431b57 Mon Sep 17 00:00:00 2001
From: Alex Young <alex@bytemark.co.uk>
Date: Thu, 31 May 2012 13:23:12 +0100
Subject: [PATCH] Run the nbd_scenario tests under valgrind

---
 tests/flexnbd.rb | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/tests/flexnbd.rb b/tests/flexnbd.rb
index 49224c9..5876f27 100644
--- a/tests/flexnbd.rb
+++ b/tests/flexnbd.rb
@@ -4,7 +4,7 @@ require 'socket'
 #
 class FlexNBD
   attr_reader :bin, :ctrl, :pid, :ip, :port
-  
+
   def initialize(bin, ip, port)
     @bin  = bin
     raise "#{bin} not executable" unless File.executable?(bin)
@@ -12,60 +12,63 @@ class FlexNBD
     @ip = ip
     @port = port
   end
-  
+
   def serve(ip, port, file, *acl)
     File.unlink(ctrl) if File.exists?(ctrl)
     @pid = fork do
-      cmd ="#{@bin} serve "\
+      cmd ="valgrind #{@bin} serve "\
            "--addr #{ip} "\
            "--port #{port} "\
            "--file #{file} "\
            "--sock #{ctrl} "\
+           "--debug "\
            "#{acl.join(' ')}"
       exec(cmd)
     end
     sleep 0.1 until File.socket?(ctrl)
   end
-  
+
   def kill
     Process.kill("INT", @pid)
     Process.wait(@pid)
   end
-  
+
   def read(offset, length)
-    IO.popen("#{@bin} read "\
+    IO.popen("valgrind #{@bin} read "\
              "--addr #{ip} "\
              "--port #{port} "\
              "--from #{offset} "\
+           "--debug "\
              "--size #{length}","r") do |fh|
       return fh.read
     end
     raise "read failed" unless $?.success?
   end
-  
+
   def write(offset, data)
-    IO.popen("#{@bin} write "\
+    IO.popen("valgrind #{@bin} write "\
              "--addr #{ip} "\
              "--port #{port} "\
              "--from #{offset} "\
+           "--debug "\
              "--size #{data.length}","w") do |fh|
       fh.write(data)
     end
     raise "write failed" unless $?.success?
     nil
   end
-  
+
   def mirror(bandwidth=nil, action=nil)
     control_command("mirror", ip, port, bandwidth, action)
   end
-  
+
   def acl(*acl)
     control_command("acl", *acl)
   end
-  
+
   def status
   end
-  
+
   protected
   def control_command(*args)
     raise "Server not running" unless @pid
@@ -74,6 +77,6 @@ class FlexNBD
       u.write(args.join("\n") + "\n")
       code, message = u.readline.split(": ", 2)
       return [code, message]
-    end    
+    end
   end
 end