Patchwork tests/tcg: fix unused result warnings

login
register
mail settings
Submitter Catalin Patulea
Date Oct. 29, 2012, 7:06 a.m.
Message ID <1351494388-28583-1-git-send-email-catalinp@google.com>
Download mbox | patch
Permalink /patch/194860/
State New
Headers show

Comments

Catalin Patulea - Oct. 29, 2012, 7:06 a.m.
With i386-linux-user target on x86_64 host, this does not introduce any new test
failures.

Signed-off-by: Catalin Patulea <catalinp@google.com>
---
 tests/tcg/test-mmap.c  |   15 +++++++++++----
 tests/tcg/testthread.c |   11 +++++++++--
 2 files changed, 20 insertions(+), 6 deletions(-)
Peter Maydell - Oct. 29, 2012, 8:38 a.m.
On 29 October 2012 07:06, Catalin Patulea <catalinp@google.com> wrote:
> With i386-linux-user target on x86_64 host, this does not introduce any new test
> failures.
>
> Signed-off-by: Catalin Patulea <catalinp@google.com>

Looks good, but checkpatch.pl complains about a bunch of style
issues -- can you fix them, please?

thanks
-- PMM

Patch

diff --git a/tests/tcg/test-mmap.c b/tests/tcg/test-mmap.c
index c418b67..d6d8288 100644
--- a/tests/tcg/test-mmap.c
+++ b/tests/tcg/test-mmap.c
@@ -22,6 +22,7 @@ 
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -429,6 +430,12 @@  void check_file_fixed_mmaps(void)
 	fprintf (stderr, " passed\n");
 }
 
+void checked_write(int fd, const void *buf, size_t count)
+{
+	ssize_t rc = write (fd, buf, count);
+	fail_unless(rc == count);
+}
+
 int main(int argc, char **argv)
 {
 	char tempname[] = "/tmp/.cmmapXXXXXX";
@@ -451,12 +458,12 @@  int main(int argc, char **argv)
 
 	/* Fill the file with int's counting from zero and up.  */
 	for (i = 0; i < (pagesize * 4) / sizeof i; i++)
-		write (test_fd, &i, sizeof i);
+		checked_write (test_fd, &i, sizeof i);
 	/* Append a few extra writes to make the file end at non 
 	   page boundary.  */
-	write (test_fd, &i, sizeof i); i++;
-	write (test_fd, &i, sizeof i); i++;
-	write (test_fd, &i, sizeof i); i++;
+	checked_write (test_fd, &i, sizeof i); i++;
+	checked_write (test_fd, &i, sizeof i); i++;
+	checked_write (test_fd, &i, sizeof i); i++;
 
 	test_fsize = lseek(test_fd, 0, SEEK_CUR);
 
diff --git a/tests/tcg/testthread.c b/tests/tcg/testthread.c
index 27e4825..2679af1 100644
--- a/tests/tcg/testthread.c
+++ b/tests/tcg/testthread.c
@@ -1,3 +1,4 @@ 
+#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -8,6 +9,12 @@ 
 #include <sys/wait.h>
 #include <sched.h>
 
+void checked_write(int fd, const void *buf, size_t count)
+{
+    ssize_t rc = write(fd, buf, count);
+    assert(rc == count);
+}
+
 void *thread1_func(void *arg)
 {
     int i;
@@ -15,7 +22,7 @@  void *thread1_func(void *arg)
 
     for(i=0;i<10;i++) {
         snprintf(buf, sizeof(buf), "thread1: %d %s\n", i, (char *)arg);
-        write(1, buf, strlen(buf));
+        checked_write(1, buf, strlen(buf));
         usleep(100 * 1000);
     }
     return NULL;
@@ -27,7 +34,7 @@  void *thread2_func(void *arg)
     char buf[512];
     for(i=0;i<20;i++) {
         snprintf(buf, sizeof(buf), "thread2: %d %s\n", i, (char *)arg);
-        write(1, buf, strlen(buf));
+        checked_write(1, buf, strlen(buf));
         usleep(150 * 1000);
     }
     return NULL;