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 e83633d83969964c1e4a364ae302fdb31533a2f1..cc976689969e47dac2b4cc166647b390cdce0dab 100644 (file)
--- 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 cab48005191260fdfd87ec7274a32abac9bcd052..6fb2bfc6cab8fccfcd041c4496bc91562ac7aba1 100644 (file)
--- 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 c4aa6f04fe5303f75950d57590f65cf38b4a5857..53cdf1e93932ca17425a34ec1a615a83df38bad9 100644 (file)
--- 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 (file)
index 4944bba..0000000
--- 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 (file)
index 53cdf1e..0000000
--- 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 ef6278b350fade44d5b345a894cb23c98c5d2325..47db3ec4e18dcf4597fad07940aa72237c953269 100644 (file)
--- a/memcheck/tests/post-syscall.vgtest
+++ b/memcheck/tests/post-syscall.vgtest
@@ -1 +1,2 @@
 prog: post-syscall
+vgopts: -q