From: Nicholas Nethercote <njn@valgrind.org>
Date: Mon, 4 May 2009 01:17:56 +0000 (+0000)
Subject: Merged r9741 (make post-syscall more portable) from the DARWIN branch.
X-Git-Tag: svn/VALGRIND_3_5_0~727
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97e628e4be54a15602c220a976584adebd4cecf1;p=thirdparty%2Fvalgrind.git

Merged r9741 (make post-syscall more portable) from the DARWIN branch.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9742
---

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index e83633d839..cc97668996 100644
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -128,7 +128,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
 	pipe.stderr.exp pipe.vgtest \
 	pointer-trace.vgtest \
 	pointer-trace.stderr.exp \
-	post-syscall.stderr.exp post-syscall.stdout.exp post-syscall.vgtest \
+	post-syscall.stderr.exp post-syscall.vgtest \
 	realloc1.stderr.exp realloc1.vgtest \
 	realloc2.stderr.exp realloc2.vgtest \
 	realloc3.stderr.exp realloc3.vgtest \
diff --git a/memcheck/tests/post-syscall.c b/memcheck/tests/post-syscall.c
index cab4800519..6fb2bfc6ca 100644
--- a/memcheck/tests/post-syscall.c
+++ b/memcheck/tests/post-syscall.c
@@ -29,10 +29,10 @@ int main()
 	ret = nanosleep(&req, &rem);
 	
 	if (ret != -1 || errno != EINTR) {
-		printf("FAILED: expected nanosleep to be interrupted\n");
+		fprintf(stderr, "FAILED: expected nanosleep to be interrupted\n");
 	} else {
 		VALGRIND_CHECK_VALUE_IS_DEFINED(rem);
-		printf("PASSED\n"); /* assuming CHECK_VALUE_IS_DEFINED doesn't print anything */
+		fprintf(stderr, "PASSED\n"); /* assuming CHECK_VALUE_IS_DEFINED doesn't print anything */
 	}
 
 	return 0;
diff --git a/memcheck/tests/post-syscall.stderr.exp b/memcheck/tests/post-syscall.stderr.exp
index c4aa6f04fe..53cdf1e939 100644
--- a/memcheck/tests/post-syscall.stderr.exp
+++ b/memcheck/tests/post-syscall.stderr.exp
@@ -1,7 +1 @@
-
-
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 0 allocs, 0 frees, 0 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v
+PASSED
diff --git a/memcheck/tests/post-syscall.stderr.exp2 b/memcheck/tests/post-syscall.stderr.exp2
deleted file mode 100644
index 4944bba7f6..0000000000
--- a/memcheck/tests/post-syscall.stderr.exp2
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 1 allocs, 1 frees, 24 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v
diff --git a/memcheck/tests/post-syscall.stdout.exp b/memcheck/tests/post-syscall.stdout.exp
deleted file mode 100644
index 53cdf1e939..0000000000
--- a/memcheck/tests/post-syscall.stdout.exp
+++ /dev/null
@@ -1 +0,0 @@
-PASSED
diff --git a/memcheck/tests/post-syscall.vgtest b/memcheck/tests/post-syscall.vgtest
index ef6278b350..47db3ec4e1 100644
--- a/memcheck/tests/post-syscall.vgtest
+++ b/memcheck/tests/post-syscall.vgtest
@@ -1 +1,2 @@
 prog: post-syscall
+vgopts: -q