[Valgrind-developers] valgrind: r7962 - branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Author: sewardj
Date: 2008-04-30 10:16:15 +0100 (Wed, 30 Apr 2008)
New Revision: 7962

Log:
Use a client request to create the undefinedness, rather than malloc,
otherwise .stdout of this test is not consistent across different
platforms.

Split expected stderr into 32-bit and 64-bit variants.



Added:
   branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.stderr.exp-amd64-glibc25
   branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.stderr.exp-x86-glibc25
Removed:
   branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.stderr.exp
Modified:
   branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/Makefile.am
   branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.c
   branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.stdout.exp


Modified: branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/Makefile.am
===================================================================

--- branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/Makefile.am	2008-04-29 22:26:44 UTC (rev 7961)
+++ branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/Makefile.am	2008-04-30 09:16:15 UTC (rev 7962)
@@ -104,7 +104,8 @@
 	origin4-many.stderr.exp-x86-glibc25 \
 	origin4-many.stderr.exp-amd64-glibc25 \
 	origin5-bz2.vgtest origin5-bz2.stdout.exp \
-	origin5-bz2.stderr.exp \
+	origin5-bz2.stderr.exp-x86-glibc25 \
+	origin5-bz2.stderr.exp-amd64-glibc25 \
 	oset_test.stderr.exp oset_test.stdout.exp oset_test.vgtest \
 	overlap.stderr.exp overlap.stdout.exp overlap.vgtest \
 	partiallydefinedeq.vgtest partiallydefinedeq.stderr.exp \

Modified: branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.c
===================================================================
--- branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.c	2008-04-29 22:26:44 UTC (rev 7961)
+++ branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.c	2008-04-30 09:16:15 UTC (rev 7962)
@@ -6454,6 +6454,8 @@
        ,"???"   /* for future */
 };
 
+#include "../memcheck.h"
+
 // If given a cmd line arg, behave as a correctness regtest
 // (run fast and be verbose).  If not, run for a long time
 // which is what is needed for the performance suite.
@@ -6462,9 +6464,8 @@
    int   r;
    int   bit;
    int   i;
-   char* undef;
    int regtest;
-   volatile char undefS;
+
    assert(argc == 1 || argc == 2);
    regtest = argc==2;
    serviceFn = g_serviceFn;
@@ -6473,10 +6474,9 @@
    nIn = vex_strlen(inbuf)+1;
    vex_printf( "%d bytes read\n", nIn );
 
-   undef = malloc(1); assert(undef);
-   //inbuf[10] = *undef;
-   inbuf[10] = undefS;
-   free(undef);
+   /* Make inbuf[10] be undefined, so as to check that this source
+      eventually shows up in various places. */
+   VALGRIND_MAKE_MEM_UNDEFINED(&inbuf[10], sizeof(char));
 
    if (inbuf[10] == 11) vex_printf("foo\n"); else vex_printf("bar\n");
 

Deleted: branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.stderr.exp
===================================================================
--- branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.stderr.exp	2008-04-29 22:26:44 UTC (rev 7961)
+++ branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.stderr.exp	2008-04-30 09:16:15 UTC (rev 7962)
@@ -1,105 +0,0 @@
-Conditional jump or move depends on uninitialised value(s)
-   at 0x........: main (origin5-bz2.c:6481)
- Uninitialised value was created by a stack allocation
-   at 0x........: main (origin5-bz2.c:6461)
-
-Conditional jump or move depends on uninitialised value(s)
-   at 0x........: handle_compress (origin5-bz2.c:4686)
-   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
-   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
-   by 0x........: main (origin5-bz2.c:6484)
- Uninitialised value was created by a stack allocation
-   at 0x........: main (origin5-bz2.c:6461)
-
-Use of uninitialised value of size 8
-   at 0x........: handle_compress (origin5-bz2.c:4686)
-   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
-   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
-   by 0x........: main (origin5-bz2.c:6484)
- Uninitialised value was created by a stack allocation
-   at 0x........: main (origin5-bz2.c:6461)
-
-Use of uninitialised value of size 8
-   at 0x........: handle_compress (origin5-bz2.c:4686)
-   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
-   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
-   by 0x........: main (origin5-bz2.c:6484)
- Uninitialised value was created by a stack allocation
-   at 0x........: main (origin5-bz2.c:6461)
-
-Use of uninitialised value of size 8
-   at 0x........: BZ2_blockSort (origin5-bz2.c:2820)
-   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
-   by 0x........: handle_compress (origin5-bz2.c:4753)
-   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
-   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
-   by 0x........: main (origin5-bz2.c:6484)
- Uninitialised value was created by a stack allocation
-   at 0x........: main (origin5-bz2.c:6461)
-
-Use of uninitialised value of size 8
-   at 0x........: BZ2_blockSort (origin5-bz2.c:2823)
-   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
-   by 0x........: handle_compress (origin5-bz2.c:4753)
-   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
-   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
-   by 0x........: main (origin5-bz2.c:6484)
- Uninitialised value was created by a stack allocation
-   at 0x........: main (origin5-bz2.c:6461)
-
-Use of uninitialised value of size 8
-   at 0x........: BZ2_blockSort (origin5-bz2.c:2854)
-   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
-   by 0x........: handle_compress (origin5-bz2.c:4753)
-   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
-   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
-   by 0x........: main (origin5-bz2.c:6484)
- Uninitialised value was created by a stack allocation
-   at 0x........: main (origin5-bz2.c:6461)
-
-Use of uninitialised value of size 8
-   at 0x........: BZ2_blockSort (origin5-bz2.c:2858)
-   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
-   by 0x........: handle_compress (origin5-bz2.c:4753)
-   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
-   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
-   by 0x........: main (origin5-bz2.c:6484)
- Uninitialised value was created by a stack allocation
-   at 0x........: main (origin5-bz2.c:6461)
-
-Use of uninitialised value of size 8
-   at 0x........: BZ2_blockSort (origin5-bz2.c:2963)
-   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
-   by 0x........: handle_compress (origin5-bz2.c:4753)
-   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
-   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
-   by 0x........: main (origin5-bz2.c:6484)
- Uninitialised value was created by a stack allocation
-   at 0x........: main (origin5-bz2.c:6461)
-
-Use of uninitialised value of size 8
-   at 0x........: fallbackSort (origin5-bz2.c:2269)
-   by 0x........: BZ2_blockSort (origin5-bz2.c:3116)
-   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
-   by 0x........: handle_compress (origin5-bz2.c:4753)
-   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
-   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
-   by 0x........: main (origin5-bz2.c:6484)
- Uninitialised value was created by a stack allocation
-   at 0x........: main (origin5-bz2.c:6461)
-
-Use of uninitialised value of size 8
-   at 0x........: fallbackSort (origin5-bz2.c:2275)
-   by 0x........: BZ2_blockSort (origin5-bz2.c:3116)
-   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
-   by 0x........: handle_compress (origin5-bz2.c:4753)
-   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
-   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
-   by 0x........: main (origin5-bz2.c:6484)
- Uninitialised value was created by a stack allocation
-   at 0x........: main (origin5-bz2.c:6461)
-
-Conditional jump or move depends on uninitialised value(s)
-   at 0x........: main (origin5-bz2.c:6512)
- Uninitialised value was created by a stack allocation
-   at 0x........: main (origin5-bz2.c:6461)

Copied: branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.stderr.exp-amd64-glibc25 (from rev 7961, branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.stderr.exp)
===================================================================
--- branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.stderr.exp-amd64-glibc25	                        (rev 0)
+++ branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.stderr.exp-amd64-glibc25	2008-04-30 09:16:15 UTC (rev 7962)
@@ -0,0 +1,105 @@
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: main (origin5-bz2.c:6481)
+ Uninitialised value was created by a stack allocation
+   at 0x........: main (origin5-bz2.c:6461)
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: handle_compress (origin5-bz2.c:4686)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a stack allocation
+   at 0x........: main (origin5-bz2.c:6461)
+
+Use of uninitialised value of size 8
+   at 0x........: handle_compress (origin5-bz2.c:4686)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a stack allocation
+   at 0x........: main (origin5-bz2.c:6461)
+
+Use of uninitialised value of size 8
+   at 0x........: handle_compress (origin5-bz2.c:4686)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a stack allocation
+   at 0x........: main (origin5-bz2.c:6461)
+
+Use of uninitialised value of size 8
+   at 0x........: BZ2_blockSort (origin5-bz2.c:2820)
+   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
+   by 0x........: handle_compress (origin5-bz2.c:4753)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a stack allocation
+   at 0x........: main (origin5-bz2.c:6461)
+
+Use of uninitialised value of size 8
+   at 0x........: BZ2_blockSort (origin5-bz2.c:2823)
+   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
+   by 0x........: handle_compress (origin5-bz2.c:4753)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a stack allocation
+   at 0x........: main (origin5-bz2.c:6461)
+
+Use of uninitialised value of size 8
+   at 0x........: BZ2_blockSort (origin5-bz2.c:2854)
+   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
+   by 0x........: handle_compress (origin5-bz2.c:4753)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a stack allocation
+   at 0x........: main (origin5-bz2.c:6461)
+
+Use of uninitialised value of size 8
+   at 0x........: BZ2_blockSort (origin5-bz2.c:2858)
+   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
+   by 0x........: handle_compress (origin5-bz2.c:4753)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a stack allocation
+   at 0x........: main (origin5-bz2.c:6461)
+
+Use of uninitialised value of size 8
+   at 0x........: BZ2_blockSort (origin5-bz2.c:2963)
+   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
+   by 0x........: handle_compress (origin5-bz2.c:4753)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a stack allocation
+   at 0x........: main (origin5-bz2.c:6461)
+
+Use of uninitialised value of size 8
+   at 0x........: fallbackSort (origin5-bz2.c:2269)
+   by 0x........: BZ2_blockSort (origin5-bz2.c:3116)
+   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
+   by 0x........: handle_compress (origin5-bz2.c:4753)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a stack allocation
+   at 0x........: main (origin5-bz2.c:6461)
+
+Use of uninitialised value of size 8
+   at 0x........: fallbackSort (origin5-bz2.c:2275)
+   by 0x........: BZ2_blockSort (origin5-bz2.c:3116)
+   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
+   by 0x........: handle_compress (origin5-bz2.c:4753)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a stack allocation
+   at 0x........: main (origin5-bz2.c:6461)
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: main (origin5-bz2.c:6512)
+ Uninitialised value was created by a stack allocation
+   at 0x........: main (origin5-bz2.c:6461)

Added: branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.stderr.exp-x86-glibc25
===================================================================
--- branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.stderr.exp-x86-glibc25	                        (rev 0)
+++ branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.stderr.exp-x86-glibc25	2008-04-30 09:16:15 UTC (rev 7962)
@@ -0,0 +1,115 @@
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: main (origin5-bz2.c:6481)
+ Uninitialised value was created by a client request
+   at 0x........: main (origin5-bz2.c:6479)
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: handle_compress (origin5-bz2.c:4686)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a client request
+   at 0x........: main (origin5-bz2.c:6479)
+
+Use of uninitialised value of size 4
+   at 0x........: handle_compress (origin5-bz2.c:4686)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a client request
+   at 0x........: main (origin5-bz2.c:6479)
+
+Use of uninitialised value of size 4
+   at 0x........: handle_compress (origin5-bz2.c:4686)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a client request
+   at 0x........: main (origin5-bz2.c:6479)
+
+Use of uninitialised value of size 4
+   at 0x........: BZ2_blockSort (origin5-bz2.c:2820)
+   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
+   by 0x........: handle_compress (origin5-bz2.c:4753)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a client request
+   at 0x........: main (origin5-bz2.c:6479)
+
+Use of uninitialised value of size 4
+   at 0x........: BZ2_blockSort (origin5-bz2.c:2823)
+   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
+   by 0x........: handle_compress (origin5-bz2.c:4753)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a client request
+   at 0x........: main (origin5-bz2.c:6479)
+
+Use of uninitialised value of size 4
+   at 0x........: BZ2_blockSort (origin5-bz2.c:2855)
+   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
+   by 0x........: handle_compress (origin5-bz2.c:4753)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a client request
+   at 0x........: main (origin5-bz2.c:6479)
+
+Use of uninitialised value of size 4
+   at 0x........: BZ2_blockSort (origin5-bz2.c:2859)
+   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
+   by 0x........: handle_compress (origin5-bz2.c:4753)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a client request
+   at 0x........: main (origin5-bz2.c:6479)
+
+Use of uninitialised value of size 4
+   at 0x........: BZ2_blockSort (origin5-bz2.c:2963)
+   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
+   by 0x........: handle_compress (origin5-bz2.c:4753)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a client request
+   at 0x........: main (origin5-bz2.c:6479)
+
+Use of uninitialised value of size 4
+   at 0x........: BZ2_blockSort (origin5-bz2.c:2964)
+   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
+   by 0x........: handle_compress (origin5-bz2.c:4753)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a client request
+   at 0x........: main (origin5-bz2.c:6479)
+
+Use of uninitialised value of size 4
+   at 0x........: fallbackSort (origin5-bz2.c:2269)
+   by 0x........: BZ2_blockSort (origin5-bz2.c:3116)
+   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
+   by 0x........: handle_compress (origin5-bz2.c:4753)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a client request
+   at 0x........: main (origin5-bz2.c:6479)
+
+Use of uninitialised value of size 4
+   at 0x........: fallbackSort (origin5-bz2.c:2275)
+   by 0x........: BZ2_blockSort (origin5-bz2.c:3116)
+   by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
+   by 0x........: handle_compress (origin5-bz2.c:4753)
+   by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
+   by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630)
+   by 0x........: main (origin5-bz2.c:6484)
+ Uninitialised value was created by a client request
+   at 0x........: main (origin5-bz2.c:6479)
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: main (origin5-bz2.c:6512)
+ Uninitialised value was created by a client request
+   at 0x........: main (origin5-bz2.c:6479)

Modified: branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.stdout.exp
===================================================================
--- branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.stdout.exp	2008-04-29 22:26:44 UTC (rev 7961)
+++ branches/OTRACK_BY_INSTRUMENTATION/memcheck/tests/origin5-bz2.stdout.exp	2008-04-30 09:16:15 UTC (rev 7962)
@@ -1,15 +1,15 @@
 22323 bytes read
 bar
-    block 1: crc = 0x3EE781DE, combined CRC = 0x3EE781DE, size = 22373
+    block 1: crc = 0xA212ABF8, combined CRC = 0xA212ABF8, size = 22373
     too repetitive; using fallback sorting algorithm
-      22373 in block, 13509 after MTF & 1-2 coding, 79+2 syms in use
-      pass 1: size is 17126, grp uses are 37 63 3 89 7 72 
-      pass 2: size is 6508, grp uses are 24 76 4 91 14 62 
-      pass 3: size is 6485, grp uses are 21 69 4 89 17 71 
-      pass 4: size is 6475, grp uses are 21 69 4 84 22 71 
-      bytes: mapping 19, selectors 66, code lengths 131, codes 6472
-    final combined CRC = 0x3EE781DE
-   6714 after compression
+      22373 in block, 13504 after MTF & 1-2 coding, 79+2 syms in use
+      pass 1: size is 17143, grp uses are 38 62 2 92 6 71 
+      pass 2: size is 6506, grp uses are 28 71 0 86 9 77 
+      pass 3: size is 6479, grp uses are 26 70 0 81 11 83 
+      pass 4: size is 6469, grp uses are 26 69 0 74 17 85 
+      bytes: mapping 19, selectors 66, code lengths 134, codes 6465
+    final combined CRC = 0xA212ABF8
+   6710 after compression
 bit 0   -5  DATA_ERROR_MAGIC 
 bit 1   -5  DATA_ERROR_MAGIC 
 bit 2   -5  DATA_ERROR_MAGIC 



