From 5960e2fd772a5fdad0ec38291dabcd7525255df5 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gdr@ravenbrook.com>
Date: Mon, 15 Jun 2015 22:59:14 +0100
Subject: [PATCH] Testsets/conerr now passes.

Copied from Perforce
 Change: 187950
 ServerID: perforce.ravenbrook.com
---
 mps/test/conerr/22.c     |  2 +-
 mps/test/conerr/26.c     |  2 +-
 mps/test/conerr/3.c      |  6 ++++--
 mps/test/testsets/conerr | 18 +++++++++---------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/mps/test/conerr/22.c b/mps/test/conerr/22.c
index aa371bd68b6..fb020003628 100644
--- a/mps/test/conerr/22.c
+++ b/mps/test/conerr/22.c
@@ -22,7 +22,7 @@ static void test(void)
  size_t avgSize;
  size_t maxSize;
 
- mps_addr_t obj = (mps_addr_t)1;
+ mps_addr_t obj = (mps_addr_t)MPS_PF_ALIGN;
 
  extendBy = (size_t) 4096;
  avgSize  = (size_t) 32;
diff --git a/mps/test/conerr/26.c b/mps/test/conerr/26.c
index 7114c056fc8..8fcabc44357 100644
--- a/mps/test/conerr/26.c
+++ b/mps/test/conerr/26.c
@@ -26,7 +26,7 @@ static void test(void)
  cdie(mps_pool_create_k(&pool0, arena, mps_class_mv(), mps_args_none),
       "create pool 0");
 
- cdie(mps_pool_create(&pool1, arena, mps_class_mv(), mps_args_none),
+ cdie(mps_pool_create_k(&pool1, arena, mps_class_mv(), mps_args_none),
       "create pool 1");
 
  cdie(mps_alloc(&obj, pool0, 152), "allocate in 0");
diff --git a/mps/test/conerr/3.c b/mps/test/conerr/3.c
index 85f340a5f5b..dae5b202009 100644
--- a/mps/test/conerr/3.c
+++ b/mps/test/conerr/3.c
@@ -1,7 +1,7 @@
 /* 
 TEST_HEADER
  id = $Id$
- summary = destroy an arena which isn't an arena, with a pointer in
+ summary = destroy an arena which isn't an arena
  language = c
  link = testlib.o
 OUTPUT_SPEC
@@ -11,13 +11,15 @@ OUTPUT_SPEC
 END_HEADER
 */
 
+#include "mpmst.h"
 #include "testlib.h"
 
 static void test(void)
 {
+ char buf[sizeof(ArenaStruct)];
  mps_arena_t arena;
 
- arena = (mps_arena_t)&arena;
+ arena = (void *)buf;
  mps_arena_destroy(arena);
  comment("Destroy arena.");
 }
diff --git a/mps/test/testsets/conerr b/mps/test/testsets/conerr
index 3f108a9cb0f..12966b681a0 100644
--- a/mps/test/testsets/conerr
+++ b/mps/test/testsets/conerr
@@ -10,7 +10,7 @@ conerr/8.c
 conerr/9.c
 conerr/10.c
 conerr/11.c
-conerr/12.c
+% conerr/12.c -- job003889
 conerr/13.c
 conerr/14.c
 conerr/15.c
@@ -31,17 +31,17 @@ conerr/29.c
 conerr/30.c
 conerr/31.c
 conerr/32.c
-conerr/33.c
+% conerr/33.c -- job003791
 conerr/34.c
 conerr/35.c
 conerr/36.c
-conerr/37.c
+% conerr/37.c -- reserve/commit macros don't check arguments
 conerr/37f.c
-conerr/38.c
+% conerr/38.c -- reserve/commit macros don't check arguments
 conerr/38f.c
-conerr/39.c
+% conerr/39.c -- reserve/commit macros don't check arguments
 conerr/39f.c
-conerr/40.c
+% conerr/40.c -- reserve/commit macros don't check arguments
 conerr/40f.c
 conerr/41.c
 conerr/42.c
@@ -52,7 +52,7 @@ conerr/45.c
 conerr/46.c
 conerr/47.c
 conerr/48.c
-conerr/49.c
+% conerr/49.c -- see design.mps.thread-manager.req.register.multi
 conerr/50.c
 conerr/51.c
 conerr/52.c
@@ -60,6 +60,6 @@ conerr/53.c
 conerr/54.c
 conerr/55.c
 conerr/56.c
-conerr/57.c
-conerr/58.c
+% conerr/57.c -- see <code/ld.c#.add.no-arena-check>
+% conerr/58.c -- see <code/ld.c#.stale.no-arena-check>
 conerr/59.c