[Valgrind-developers] valgrind/memcheck/tests

[Dirk M. <mu...@kd...>]

CVS commit by mueller: 

Fix compilation on FreeBSD. extracted from patch by Doug Rabson <df...@nl...>


  M +1 -1      custom_alloc.c   1.2
  M +2 -2      filter_allocs   1.3
  M +1 -1      filter_leak_check_size   1.4
  M +1 -1      filter_stderr   1.9
  M +1 -1      manuel2.c   1.3
  M +1 -1      manuel3.c   1.3
  M +1 -1      metadata.c   1.2
  M +1 -1      nanoleak.c   1.3
  M +1 -1      realloc2.c   1.3
  M +2 -2      sigaltstack.c   1.7
  M +4 -4      zeropage.c   1.2


--- valgrind/memcheck/tests/custom_alloc.c  #1.1:1.2
@@ -15,5 +15,5 @@ void* get_superblock(void)
 {
    void* p = mmap( 0, SUPERBLOCK_SIZE, PROT_READ|PROT_WRITE|PROT_EXEC,
-                   MAP_PRIVATE|MAP_ANONYMOUS, -1, 0 );
+                   MAP_PRIVATE|MAP_ANON, -1, 0 );
 
    assert(p != ((void*)(-1)));

--- valgrind/memcheck/tests/filter_allocs  #1.2:1.3
@@ -2,5 +2,5 @@
 
 ./filter_stderr |
-sed "s/malloc\/free: in use at exit: [0-9]\+ bytes in [0-9]\+ blocks./malloc\/free: in use at exit: ... bytes in ... blocks./" |
-sed "s/malloc.free: [0-9]\+ allocs, [0-9]\+ frees, [0-9]\+ bytes allocated./malloc\/free: ... allocs, ... frees, ... bytes allocated./"
+sed "s/malloc\/free: in use at exit: [0-9]* bytes in [0-9]* blocks./malloc\/free: in use at exit: ... bytes in ... blocks./" |
+sed "s/malloc.free: [0-9]* allocs, [0-9]* frees, [0-9]* bytes allocated./malloc\/free: ... allocs, ... frees, ... bytes allocated./"
 

--- valgrind/memcheck/tests/filter_leak_check_size  #1.3:1.4
@@ -2,3 +2,3 @@
 
 ./filter_stderr |
-sed "s/checked [0-9]\+ bytes./checked ... bytes./"
+sed "s/checked [0-9]* bytes./checked ... bytes./"

--- valgrind/memcheck/tests/filter_stderr  #1.8:1.9
@@ -9,5 +9,5 @@
 
 # Anonymise line numbers in mac_replace_strmem.c
-sed "s/mac_replace_strmem.c:[0-9]\+/mac_replace_strmem.c:.../"  |
+sed "s/mac_replace_strmem.c:[0-9]*/mac_replace_strmem.c:.../"  |
 
 $dir/../../tests/filter_test_paths                      |

--- valgrind/memcheck/tests/manuel2.c  #1.2:1.3
@@ -1,4 +1,4 @@
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 int main ()

--- valgrind/memcheck/tests/manuel3.c  #1.2:1.3
@@ -1,4 +1,4 @@
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 int gcc_cant_inline_me ( int );

--- valgrind/memcheck/tests/metadata.c  #1.1:1.2
@@ -1,5 +1,5 @@
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "../memcheck.h"
 

--- valgrind/memcheck/tests/nanoleak.c  #1.2:1.3
@@ -1,4 +1,4 @@
 
-#include <malloc.h>
+#include <stdlib.h>
 
 int main ( void )

--- valgrind/memcheck/tests/realloc2.c  #1.2:1.3
@@ -4,5 +4,5 @@
    without error. */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 

--- valgrind/memcheck/tests/sigaltstack.c  #1.6:1.7
@@ -2,5 +2,5 @@
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <signal.h>
 #include <sys/mman.h>
@@ -16,5 +16,5 @@ int main(int argv, char** argc) {
   struct sigaction act;
   static const int size = SIGSTKSZ*2;
-  char *stk = (char *)mmap(0, size, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
+  char *stk = (char *)mmap(0, size, PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, 0);
   sigstk.ss_sp = stk;
 

--- valgrind/memcheck/tests/zeropage.c  #1.1:1.2
@@ -13,5 +13,5 @@ int main(void)
    /* mmap(0x0, ... FIXED) should fail */
    int* m = mmap(0x0, 1000000, PROT_READ|PROT_WRITE, 
-                 MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0);
+                 MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
    if (m != (int*)-1)
       printf("succeeded?!\n");
@@ -19,5 +19,5 @@ int main(void)
    /* mmap(0x1000, ... FIXED) should fail */
         m = mmap((void*)0x1000, 1000000, PROT_READ|PROT_WRITE, 
-                 MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0);
+                 MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
    if (m != (int*)-1)
       printf("succeeded?!\n");
@@ -25,5 +25,5 @@ int main(void)
    /* mmap(0xa000, ... FIXED) should fail */
         m = mmap((void*)0xa000, 1000000, PROT_READ|PROT_WRITE, 
-                 MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0);
+                 MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
    if (m != (int*)-1)
       printf("succeeded?!\n");
@@ -31,5 +31,5 @@ int main(void)
    /* mmap(0x10000, ... FIXED) should fail */
         m = mmap((void*)0x10000, 1000000, PROT_READ|PROT_WRITE, 
-                 MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0);
+                 MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
    if (m == (int*)-1)
       printf("failed?!\n");