Merge, just renaming old error macros.

Rakefile

@@ -101,8 +101,23 @@ file check("acl") =>
   gcc_link t.name, t.prerequisites + [LIBCHECK]
 end
 
+file check("serve") =>
+%w{tests/check_serve.c
+  build/self_pipe.o
+  build/nbdtypes.o
+  build/control.o
+  build/readwrite.o
+  build/parse.o
+  build/client.o
+  build/serve.o 
+  build/acl.o
+  build/ioutil.o 
+  build/util.o} do |t|
+  gcc_link t.name, t.prerequisites + [LIBCHECK]
+end
 
-(TEST_MODULES- %w{acl client}).each do |m|
+
+(TEST_MODULES- %w{acl client serve}).each do |m|
   deps = ["tests/check_#{m}.c", "build/ioutil.o", "build/util.o"]
   maybe_obj_name = "build/#{m}.o"