---

yaml
---
r: 5215
b: refs/heads/master
c: f1e348c
h: refs/heads/master
i:
  5213: b0651df
  5211: 97d3eef
  5207: 2c949d9
  5199: 234cd7d
  5183: 656a8d1
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1131748c2e86bcbcbbbec81a83ca844e58073b4
+refs/heads/master: f1e348ce6ae8b80bcb3ffd81934d82dbdddc7647

trunk/mk/platform.mk

@@ -114,7 +114,7 @@ ifdef CFG_UNIXY
   endif
   ifdef CFG_VALGRIND
     CFG_VALGRIND += --leak-check=full \
-                    --error-exitcode=1 \
+                    --error-exitcode=100 \
                     --quiet --suppressions=$(CFG_SRC_DIR)src/etc/x86.supp
   endif
 endif

trunk/src/test/compiletest/procsrv.rs

@@ -66,7 +66,7 @@ fn run(handle: &handle, lib_path: &str, prog: &str, args: &[str],
     writeclose(resp.infd, input);
     let output = readclose(resp.outfd);
     let errput = readclose(resp.errfd);
-    let status = os::waitpid(resp.pid);
+    let status = run::waitpid(resp.pid);
     ret {status: status, out: output, err: errput};
 }
 

trunk/src/test/compiletest/runtest.rs

@@ -55,11 +55,7 @@ fn run_rfail_test(cx: &cx, props: &test_props, testfile: &str) {
         fatal_procres("run-fail test didn't produce an error!", procres);
     }
 
-    // This is the value valgrind returns on failure
-    // FIXME: Why is this value neither the value we pass to
-    // valgrind as --error-exitcode (1), nor the value we see as the
-    // exit code on the command-line (137)?
-    const valgrind_err: int = 9;
+    const valgrind_err: int = 100;
     if procres.status == valgrind_err {
         fatal_procres("run-fail test isn't valgrind-clean!", procres);
     }