From: Richard W.M. Jones <rjones@redhat.com>
Date: Wed, 3 Nov 2010 17:34:27 +0000 (+0000)
Subject: capitests: Don't open test files with O_NONBLOCK.
X-Git-Tag: 1.6.1~17
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=355662f067d255393b041a30f78afb12702bc69a;p=libguestfs.git

capitests: Don't open test files with O_NONBLOCK.

I have no idea why we were doing this.
(cherry picked from commit ec0fe45e48fa4621fc6fa0f5bcc44f184068c86f)
---

diff --git a/generator/generator_capitests.ml b/generator/generator_capitests.ml
index 707d59b..6f5f59c 100644
--- a/generator/generator_capitests.ml
+++ b/generator/generator_capitests.ml
@@ -176,7 +176,7 @@ int main (int argc, char *argv[])
   guestfs_set_error_handler (g, print_error, NULL);
 
   filename = \"test1.img\";
-  fd = open (filename, O_WRONLY|O_CREAT|O_NOCTTY|O_NONBLOCK|O_TRUNC, 0666);
+  fd = open (filename, O_WRONLY|O_CREAT|O_NOCTTY|O_TRUNC, 0666);
   if (fd == -1) {
     perror (filename);
     exit (EXIT_FAILURE);
@@ -204,7 +204,7 @@ int main (int argc, char *argv[])
   }
 
   filename = \"test2.img\";
-  fd = open (filename, O_WRONLY|O_CREAT|O_NOCTTY|O_NONBLOCK|O_TRUNC, 0666);
+  fd = open (filename, O_WRONLY|O_CREAT|O_NOCTTY|O_TRUNC, 0666);
   if (fd == -1) {
     perror (filename);
     exit (EXIT_FAILURE);
@@ -232,7 +232,7 @@ int main (int argc, char *argv[])
   }
 
   filename = \"test3.img\";
-  fd = open (filename, O_WRONLY|O_CREAT|O_NOCTTY|O_NONBLOCK|O_TRUNC, 0666);
+  fd = open (filename, O_WRONLY|O_CREAT|O_NOCTTY|O_TRUNC, 0666);
   if (fd == -1) {
     perror (filename);
     exit (EXIT_FAILURE);