From 17f420e030b56a05ae503814c899bfdeae4d2ea0 Mon Sep 17 00:00:00 2001 From: Richard Tucker Date: Mon, 15 Dec 1997 16:46:49 +0000 Subject: [PATCH] Add output specification Copied from Perforce Change: 19108 ServerID: perforce.ravenbrook.com --- mps/qa/function/16.c | 4 ++-- mps/qa/function/18.c | 2 ++ mps/qa/function/19.c | 2 ++ mps/qa/function/2.c | 1 + mps/qa/function/20.c | 2 ++ mps/qa/function/26.c | 4 ++++ mps/qa/function/28.c | 1 + mps/qa/function/3.c | 1 + mps/qa/function/30.c | 1 + mps/qa/function/31.c | 3 ++- mps/qa/function/32.c | 3 ++- mps/qa/function/33.c | 3 ++- mps/qa/function/34.c | 3 ++- mps/qa/function/35.c | 1 + mps/qa/function/36.c | 5 +++-- mps/qa/function/37.c | 1 + mps/qa/function/38.c | 5 +++-- mps/qa/function/39.c | 3 ++- mps/qa/function/4.c | 1 + mps/qa/function/40.c | 1 + mps/qa/function/41.c | 1 + mps/qa/function/42.c | 1 + mps/qa/function/43.c | 1 + mps/qa/function/44.c | 7 +++++++ mps/qa/function/46.c | 2 +- mps/qa/function/47.c | 1 + mps/qa/function/48.c | 1 + mps/qa/function/49.c | 3 ++- mps/qa/function/50.c | 7 ++++++- mps/qa/function/51.c | 17 +++++++++++++---- mps/qa/function/52.c | 1 + mps/qa/function/53.c | 1 + mps/qa/function/54.c | 1 + mps/qa/function/55.c | 1 + mps/qa/function/56.c | 1 + mps/qa/function/57.c | 1 + mps/qa/function/61.c | 5 +++-- mps/qa/function/62.c | 1 + mps/qa/function/63.c | 5 +++-- mps/qa/function/64.c | 1 + mps/qa/function/65.c | 6 ++++-- mps/qa/function/66.c | 5 +++-- mps/qa/function/67.c | 1 + mps/qa/function/68.c | 1 + mps/qa/function/69.c | 2 +- mps/qa/function/72.c | 5 +++++ mps/qa/function/73.c | 1 + mps/qa/function/74.c | 1 + mps/qa/function/75.c | 1 + 49 files changed, 102 insertions(+), 27 deletions(-) diff --git a/mps/qa/function/16.c b/mps/qa/function/16.c index 2b349cd0f0f..6042733a523 100644 --- a/mps/qa/function/16.c +++ b/mps/qa/function/16.c @@ -27,7 +27,7 @@ static void test(void) size_t alignment; mps_addr_t q; - int i; + mps_word_t i; cdie(mps_space_create(&space), "create space"); @@ -63,7 +63,7 @@ static void test(void) i = mps_collections(space)+2; - while (mps_collections(space) 100000000 END_HEADER */ @@ -47,6 +49,8 @@ static void test(void) { for (try = inf-4; try < inf+4; try++) (void) trysize(try); + + report("maxsize", "%lu", (unsigned long) inf); } int main(void) { diff --git a/mps/qa/function/28.c b/mps/qa/function/28.c index f70edba27df..8770d47bacd 100644 --- a/mps/qa/function/28.c +++ b/mps/qa/function/28.c @@ -114,5 +114,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/3.c b/mps/qa/function/3.c index fb08e79ab10..ccb2cf58523 100644 --- a/mps/qa/function/3.c +++ b/mps/qa/function/3.c @@ -2,6 +2,7 @@ summary = allocate 100 items, throw away and repeat language = c link = myfmt.o testlib.o + manual = true END_HEADER */ diff --git a/mps/qa/function/30.c b/mps/qa/function/30.c index 4aa3f3da48c..3393d04d9cf 100644 --- a/mps/qa/function/30.c +++ b/mps/qa/function/30.c @@ -114,5 +114,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/31.c b/mps/qa/function/31.c index 352061f31e0..857c7db2364 100644 --- a/mps/qa/function/31.c +++ b/mps/qa/function/31.c @@ -22,7 +22,7 @@ static void test(void) mps_fmt_t format; mps_ap_t apamc, apawl; - mycell *a, *b, *c, *d; + mycell *a, *b, *c; int i; int j; @@ -102,5 +102,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/32.c b/mps/qa/function/32.c index cd3311656d4..1f05a9af634 100644 --- a/mps/qa/function/32.c +++ b/mps/qa/function/32.c @@ -26,7 +26,7 @@ static void test(void) int i; int j; - int k,n,z; + int k,z; alloccomments = 1; @@ -102,5 +102,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/33.c b/mps/qa/function/33.c index 4ac77e2321d..be4d208c740 100644 --- a/mps/qa/function/33.c +++ b/mps/qa/function/33.c @@ -26,7 +26,7 @@ static void test(void) int i; int j; - int k,n,z; + int k,z; alloccomments = 1; @@ -102,5 +102,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/34.c b/mps/qa/function/34.c index d78efea2aff..e5a4d61e152 100644 --- a/mps/qa/function/34.c +++ b/mps/qa/function/34.c @@ -26,7 +26,7 @@ static void test(void) int i; int j; - int k,n,z; + int k,z; alloccomments = 1; formatcomments = 1; @@ -104,5 +104,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/35.c b/mps/qa/function/35.c index 4724146c409..9e1a45551c8 100644 --- a/mps/qa/function/35.c +++ b/mps/qa/function/35.c @@ -129,5 +129,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/36.c b/mps/qa/function/36.c index b063feb3c9e..df15b32b319 100644 --- a/mps/qa/function/36.c +++ b/mps/qa/function/36.c @@ -22,12 +22,12 @@ static void test(void) mps_fmt_t format; mps_ap_t apamc, apawl, apran; - mycell *a[100], *b, *c; + mycell *a[100], *c; int i; int j; - int k,n,z; + int k,z; alloccomments = 1; skipcomments = 1; @@ -110,5 +110,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/37.c b/mps/qa/function/37.c index 6d04d62eb6a..1e9f2e0fcd7 100644 --- a/mps/qa/function/37.c +++ b/mps/qa/function/37.c @@ -135,5 +135,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/38.c b/mps/qa/function/38.c index 083a1c8518d..0eb7283ddc9 100644 --- a/mps/qa/function/38.c +++ b/mps/qa/function/38.c @@ -41,11 +41,11 @@ static void test(void) { mps_thr_t thread; mps_root_t root0, root1, root2; - mps_addr_t p, q; + mps_addr_t p; mps_fmt_t format; mps_ap_t apawl, apamc; - mycell *a, *b, *c, *d, *e, *f, *g; + mycell *a, *b; int i,j; @@ -171,5 +171,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/39.c b/mps/qa/function/39.c index c813dfaa2ba..1f38925f18d 100644 --- a/mps/qa/function/39.c +++ b/mps/qa/function/39.c @@ -27,7 +27,7 @@ static void test(void) int i; int j; - int k,n,z; + int k,z; alloccomments = 1; formatcomments = 1; @@ -104,5 +104,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/4.c b/mps/qa/function/4.c index 62aa0dcdeac..3a8477e247c 100644 --- a/mps/qa/function/4.c +++ b/mps/qa/function/4.c @@ -2,6 +2,7 @@ summary = allocate 100 items, throw away and repeat language = c link = myfmt.o testlib.o + manual = true END_HEADER */ diff --git a/mps/qa/function/40.c b/mps/qa/function/40.c index c6acde3d125..4588c9ac2d1 100644 --- a/mps/qa/function/40.c +++ b/mps/qa/function/40.c @@ -103,5 +103,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/41.c b/mps/qa/function/41.c index e4ee777fdb2..002212f0d30 100644 --- a/mps/qa/function/41.c +++ b/mps/qa/function/41.c @@ -131,5 +131,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/42.c b/mps/qa/function/42.c index f387ced0d5a..672486bf124 100644 --- a/mps/qa/function/42.c +++ b/mps/qa/function/42.c @@ -127,5 +127,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/43.c b/mps/qa/function/43.c index 4bb8cb42dc1..7678e60729e 100644 --- a/mps/qa/function/43.c +++ b/mps/qa/function/43.c @@ -136,5 +136,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/44.c b/mps/qa/function/44.c index 433dc04bec1..d4689ad46f7 100644 --- a/mps/qa/function/44.c +++ b/mps/qa/function/44.c @@ -2,6 +2,10 @@ summary = clamp and space_collect tests language = c link = testlib.o exfmt.o +OUTPUT_SPEC + diff0 > 0 + diff1 > 0 + result = pass END_HEADER */ @@ -106,6 +110,7 @@ static void test(void) size1 = mps_arena_committed(space); report("sizebefore0", "%lu", (unsigned long) size0); report("sizeafter0", "%lu", (unsigned long) size1); + report("diff0", "%lu", (unsigned long) size0-size1); DC; mps_arena_release(space); comment("...released"); @@ -143,6 +148,7 @@ static void test(void) size1 = mps_arena_committed(space); report("sizebefore1", "%lu", (unsigned long) size0); report("sizeafter1", "%lu", (unsigned long) size1); + report("diff1", "%lu", (unsigned long) size0-size1); DC; } mps_arena_release(space); @@ -178,5 +184,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/46.c b/mps/qa/function/46.c index 6acddea7a76..ffdbfe5d214 100644 --- a/mps/qa/function/46.c +++ b/mps/qa/function/46.c @@ -39,7 +39,6 @@ static void test(void) mps_fmt_t format; mps_ap_t apamc; - size_t size0, size1; mycell *a, *b, *c, *d, *e, *f, *g; int i; @@ -157,5 +156,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + report("result", "unknown"); return 0; } diff --git a/mps/qa/function/47.c b/mps/qa/function/47.c index c3afabb8d87..0d182064ec5 100644 --- a/mps/qa/function/47.c +++ b/mps/qa/function/47.c @@ -114,5 +114,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/48.c b/mps/qa/function/48.c index 0fef8a5da28..b645330acc5 100644 --- a/mps/qa/function/48.c +++ b/mps/qa/function/48.c @@ -137,5 +137,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/49.c b/mps/qa/function/49.c index 15f155cdc70..9b569d51f72 100644 --- a/mps/qa/function/49.c +++ b/mps/qa/function/49.c @@ -103,7 +103,7 @@ static void test(void) { mps_fmt_t format; mps_ap_t apamc, apawl, aplo; - mycell *a, *b, *c, *d, *e, *z; + mycell *a, *b, *c, *d, *z; long int j; @@ -274,5 +274,6 @@ int main(void) { stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/50.c b/mps/qa/function/50.c index 5fb6fe99c8d..843ebd5a401 100644 --- a/mps/qa/function/50.c +++ b/mps/qa/function/50.c @@ -2,6 +2,10 @@ summary = finalization tests with AMC, AWL and LO language = c link = testlib.o rankfmt.o +OUTPUT_SPEC + count1 < 50 + count2 < 50 + result = pass END_HEADER */ @@ -103,7 +107,7 @@ static void test(void) { mps_fmt_t format; mps_ap_t apamc, apawl, aplo; - mycell *a, *b, *c, *d, *e, *z; + mycell *a, *b, *c, *d, *z; long int j; @@ -278,5 +282,6 @@ int main(void) { stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/51.c b/mps/qa/function/51.c index 0f02abbb642..c6b26d724de 100644 --- a/mps/qa/function/51.c +++ b/mps/qa/function/51.c @@ -2,6 +2,10 @@ summary = wait until all registered objects are finalized language = c link = testlib.o rankfmt.o +OUTPUT_SPEC + count = 0 + iter < 4 + result = pass END_HEADER */ @@ -103,9 +107,9 @@ static void test(void) { mps_fmt_t format; mps_ap_t apamc, apawl, aplo; - mycell *a, *b, *c, *d, *e, *z; + mycell *a, *b, *c, *d, *z; - long int j; + long int i,j; cdie(mps_space_create(&space), "create space"); @@ -179,9 +183,12 @@ static void test(void) { mps_arena_collect(space); - while (final_count != 0) { + i = 0; + + while (final_count != 0 && i < 10) { finalpoll(&z, FINAL_DISCARD); if (mps_message_poll(space) == 0) { + i++; a = allocdumb(apawl, 1024, MPS_RANK_WEAK); a = allocdumb(apamc, 1024, MPS_RANK_EXACT); a = allocdumb(aplo, 1024, MPS_RANK_EXACT); @@ -194,7 +201,8 @@ static void test(void) { there's no guarantee) */ - report("count1", "%i", final_count); + report("count", "%i", final_count); + report("iter", "%i", i); /* now to test leaving messages open for a long time! */ @@ -224,5 +232,6 @@ int main(void) { stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/52.c b/mps/qa/function/52.c index 03c2eea993b..e7b7febea8d 100644 --- a/mps/qa/function/52.c +++ b/mps/qa/function/52.c @@ -106,5 +106,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/53.c b/mps/qa/function/53.c index 9008da0083c..0dacb055596 100644 --- a/mps/qa/function/53.c +++ b/mps/qa/function/53.c @@ -125,5 +125,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/54.c b/mps/qa/function/54.c index 8bd07deb6fe..991892759a4 100644 --- a/mps/qa/function/54.c +++ b/mps/qa/function/54.c @@ -126,5 +126,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/55.c b/mps/qa/function/55.c index 7eba5feb06a..321f3dc4e5f 100644 --- a/mps/qa/function/55.c +++ b/mps/qa/function/55.c @@ -125,5 +125,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/56.c b/mps/qa/function/56.c index e3a69f5da1c..e0dddadd402 100644 --- a/mps/qa/function/56.c +++ b/mps/qa/function/56.c @@ -124,5 +124,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/57.c b/mps/qa/function/57.c index 21d72c3c275..9516b18799d 100644 --- a/mps/qa/function/57.c +++ b/mps/qa/function/57.c @@ -119,5 +119,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/61.c b/mps/qa/function/61.c index 9feb67379d4..e2dcff66e6d 100644 --- a/mps/qa/function/61.c +++ b/mps/qa/function/61.c @@ -64,8 +64,8 @@ static void test(void) for (i=1; i<10000; i++) { UC; - a = allocone(ap1, 2, 1); - b = allocone(ap2, 2, 1); + a = allocone(ap1, 100, 1); + b = allocone(ap2, 100, 1); setref(a, 0, b); setref(b, 0, a); UC; @@ -102,5 +102,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/62.c b/mps/qa/function/62.c index 332812ba938..b92430a272b 100644 --- a/mps/qa/function/62.c +++ b/mps/qa/function/62.c @@ -102,5 +102,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/63.c b/mps/qa/function/63.c index 92dc7f17b04..432197c6493 100644 --- a/mps/qa/function/63.c +++ b/mps/qa/function/63.c @@ -14,12 +14,12 @@ void *stackpointer; static void test(void) { mps_space_t space; - mps_pool_t poolamc1, poolamc2; + mps_pool_t poolamc1; mps_thr_t thread; mps_root_t root; mps_fmt_t format; - mps_ap_t ap1, ap2; + mps_ap_t ap1; mycell *a, *b; @@ -92,5 +92,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/64.c b/mps/qa/function/64.c index 630e87f8192..97c07fdbbe5 100644 --- a/mps/qa/function/64.c +++ b/mps/qa/function/64.c @@ -125,5 +125,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/65.c b/mps/qa/function/65.c index acc110f48a3..5cbe8c486a5 100644 --- a/mps/qa/function/65.c +++ b/mps/qa/function/65.c @@ -2,6 +2,9 @@ summary = sort-of-leak in arena_collect language = c link = testlib.o exfmt.o +OUTPUT_SPEC + junksize = 0 + result = pass END_HEADER */ @@ -46,8 +49,6 @@ static void test(void) mps_fmt_t format; mps_ap_t apamc; - size_t size0, size1; - typedef mycell * myroot; myroot a, b, c, d, e, f, g; @@ -198,5 +199,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/66.c b/mps/qa/function/66.c index e445d0ddbe8..c1f0d73c32a 100644 --- a/mps/qa/function/66.c +++ b/mps/qa/function/66.c @@ -41,11 +41,11 @@ static void test(void) { mps_thr_t thread; mps_root_t root0, root1, root2; - mps_addr_t p, q; + mps_addr_t p; mps_fmt_t format; mps_ap_t apawl, apamc; - mycell *a, *b, *c, *d, *e, *f, *g; + mycell *a, *b; int i,j; @@ -172,5 +172,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/67.c b/mps/qa/function/67.c index 8d2a7f9a7d5..35a858fada5 100644 --- a/mps/qa/function/67.c +++ b/mps/qa/function/67.c @@ -116,5 +116,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/68.c b/mps/qa/function/68.c index 1eb163d9cef..7cdb9ab872a 100644 --- a/mps/qa/function/68.c +++ b/mps/qa/function/68.c @@ -2,6 +2,7 @@ summary = keep calling arena_collect language = c link = testlib.o exfmt.o + manual = true END_HEADER */ diff --git a/mps/qa/function/69.c b/mps/qa/function/69.c index 78a304b15cc..2c3169e8a16 100644 --- a/mps/qa/function/69.c +++ b/mps/qa/function/69.c @@ -27,7 +27,6 @@ static void test(void) { mycell *a, *b; tag tag; - long int j; long int i; cdie(mps_space_create(&space), "create space"); @@ -113,5 +112,6 @@ int main(void) { stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/72.c b/mps/qa/function/72.c index 24ed85be6ef..22c6a3b9e65 100644 --- a/mps/qa/function/72.c +++ b/mps/qa/function/72.c @@ -2,6 +2,10 @@ summary = request.dylan.170439 (detect bad pointers) language = c link = testlib.o exfmt.o +OUTPUT_SPEC + assert = true + assertfile = .\trace.c + assertline = 963 END_HEADER */ @@ -92,5 +96,6 @@ int main(void) stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/73.c b/mps/qa/function/73.c index 5a6244799ea..e69e6dee699 100644 --- a/mps/qa/function/73.c +++ b/mps/qa/function/73.c @@ -86,5 +86,6 @@ int main(void) { stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/74.c b/mps/qa/function/74.c index 57e2e6ce09f..326e16febfd 100644 --- a/mps/qa/function/74.c +++ b/mps/qa/function/74.c @@ -86,5 +86,6 @@ int main(void) { stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; } diff --git a/mps/qa/function/75.c b/mps/qa/function/75.c index be86572ffa0..0c8e9f3db8b 100644 --- a/mps/qa/function/75.c +++ b/mps/qa/function/75.c @@ -86,5 +86,6 @@ int main(void) { stackpointer=&m; /* hack to get stack pointer */ easy_tramp(test); + pass(); return 0; }