Add a new expected output for this test. Really it's a bad test,

in the sense that there are a huge number of valid outcomes, but
I'm not sure how to test it better.

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

diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index a27e947c5f18d51ffbc5065863a5de164427c625..3c9c00bf8d4dc47c7e12171336084d5b33a80346 100644 (file)
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -78,7 +78,9 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        mq.stderr.exp mq.vgtest \
        mremap.stderr.exp mremap.stdout.exp mremap.vgtest \
        mremap2.stderr.exp \
-       mremap2.stdout.exp mremap2.stdout.exp2 mremap2.vgtest \
+       mremap2.stdout.exp mremap2.stdout.exp2 \
+       mremap2.stdout.exp-glibc28-amd64 \
+       mremap2.vgtest \
        munmap_exe.stderr.exp munmap_exe.vgtest \
        nestedfns.stderr.exp nestedfns.stdout.exp nestedfns.vgtest \
        pending.stdout.exp pending.stderr.exp pending.vgtest \

diff --git a/none/tests/mremap2.stdout.exp-glibc28-amd64 b/none/tests/mremap2.stdout.exp-glibc28-amd64
new file mode 100644 (file)
index 0000000..7900013
--- /dev/null
+++ b/none/tests/mremap2.stdout.exp-glibc28-amd64
@@ -0,0 +1,296 @@
+
+dst_possible   = 0x........
+dst_impossible = 0x........
+           src = 0x........
+
+maymv 0   fixed 0   newsz 19   dstpo 0  dst 0x........ ->  0x........ (== src)
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXX...........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 0   newsz 19   dstpo 1  dst 0x........ ->  0x........ (== src)
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXX...........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 0   newsz 20   dstpo 0  dst 0x........ ->  0x........ (== src)
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 0   newsz 20   dstpo 1  dst 0x........ ->  0x........ (== src)
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 0   newsz 21   dstpo 0  dst 0x........ ->  error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 0   newsz 21   dstpo 1  dst 0x........ ->  error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 0   newsz 29   dstpo 0  dst 0x........ ->  error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 0   newsz 29   dstpo 1  dst 0x........ ->  error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 0   newsz 30   dstpo 0  dst 0x........ ->  error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 0   newsz 30   dstpo 1  dst 0x........ ->  error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 0   newsz 31   dstpo 0  dst 0x........ ->  error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 0   newsz 31   dstpo 1  dst 0x........ ->  error 12
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+
+maymv 0   fixed 1   newsz 19   dstpo 0  dst 0x........ ->  error 22
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 1   newsz 19   dstpo 1  dst 0x........ ->  error 22
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 1   newsz 20   dstpo 0  dst 0x........ ->  error 22
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 1   newsz 20   dstpo 1  dst 0x........ ->  error 22
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 1   newsz 21   dstpo 0  dst 0x........ ->  error 22
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 1   newsz 21   dstpo 1  dst 0x........ ->  error 22
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 1   newsz 29   dstpo 0  dst 0x........ ->  error 22
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 1   newsz 29   dstpo 1  dst 0x........ ->  error 22
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 1   newsz 30   dstpo 0  dst 0x........ ->  error 22
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 1   newsz 30   dstpo 1  dst 0x........ ->  error 22
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 1   newsz 31   dstpo 0  dst 0x........ ->  error 22
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 0   fixed 1   newsz 31   dstpo 1  dst 0x........ ->  error 22
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+
+maymv 1   fixed 0   newsz 19   dstpo 0  dst 0x........ ->  0x........ (== src)
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXX...........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 1   fixed 0   newsz 19   dstpo 1  dst 0x........ ->  0x........ (== src)
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXX...........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 1   fixed 0   newsz 20   dstpo 0  dst 0x........ ->  0x........ (== src)
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 1   fixed 0   newsz 20   dstpo 1  dst 0x........ ->  0x........ (== src)
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 1   fixed 0   newsz 21   dstpo 0  dst 0x........ ->  0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 1   fixed 0   newsz 21   dstpo 1  dst 0x........ ->  0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 1   fixed 0   newsz 29   dstpo 0  dst 0x........ ->  0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 1   fixed 0   newsz 29   dstpo 1  dst 0x........ ->  0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 1   fixed 0   newsz 30   dstpo 0  dst 0x........ ->  0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 1   fixed 0   newsz 30   dstpo 1  dst 0x........ ->  0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 1   fixed 0   newsz 31   dstpo 0  dst 0x........ ->  0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 1   fixed 0   newsz 31   dstpo 1  dst 0x........ ->  0x........ (== other)
+XXXXXXXXX...............................XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+
+maymv 1   fixed 1   newsz 19   dstpo 0  dst 0x........ ->  error 22
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 1   fixed 1   newsz 19   dstpo 1  dst 0x........ ->  0x........ (== dst)
+XXXXXXXXX...............................XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+XXXXXXXXXXXXXXXXXXX...............................
+
+maymv 1   fixed 1   newsz 20   dstpo 0  dst 0x........ ->  error 22
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 1   fixed 1   newsz 20   dstpo 1  dst 0x........ ->  0x........ (== dst)
+XXXXXXXXX...............................XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+XXXXXXXXXXXXXXXXXXXX..............................
+
+maymv 1   fixed 1   newsz 21   dstpo 0  dst 0x........ ->  error 22
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 1   fixed 1   newsz 21   dstpo 1  dst 0x........ ->  0x........ (== dst)
+XXXXXXXXX...............................XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+XXXXXXXXXXXXXXXXXXXXX.............................
+
+maymv 1   fixed 1   newsz 29   dstpo 0  dst 0x........ ->  error 22
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 1   fixed 1   newsz 29   dstpo 1  dst 0x........ ->  0x........ (== dst)
+XXXXXXXXX...............................XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.....................
+
+maymv 1   fixed 1   newsz 30   dstpo 0  dst 0x........ ->  error 22
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 1   fixed 1   newsz 30   dstpo 1  dst 0x........ ->  0x........ (== dst)
+XXXXXXXXX...............................XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX....................
+
+maymv 1   fixed 1   newsz 31   dstpo 0  dst 0x........ ->  error 22
+XXXXXXXXX.XXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+..................................................
+
+maymv 1   fixed 1   newsz 31   dstpo 1  dst 0x........ ->  0x........ (== dst)
+XXXXXXXXX...............................XXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+..................................................
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX...................
+