merge work/borrow: borrow returns before definition, borrows clause, borrow messages and LSP diagnostics, mkgenome header mismatch values

1 files changed, 4 insertions, 1 deletions

diff --git a/tests/drivers/tools_contract_test.py b/tests/drivers/tools_contract_test.py
index 6a98678..9323a47 100644
--- a/tests/drivers/tools_contract_test.py
+++ b/tests/drivers/tools_contract_test.py
@@ -28,9 +28,12 @@ if args.group == 'image':
         changed = words[:]; changed[index] ^= 2
         r = command(['build/bin/mkgenome'], pack(changed))
         assert r.returncode != 0 and b'not a genome' in r.stderr and not r.stdout
+        # the header words are named, with both values, and a layout mismatch points at rt.zc and the map
+        assert [b'FTOP', b'ZFP', b'third word'][index] in r.stderr, r.stderr
+        if index < 2: assert b'the map has 0x' in r.stderr and b'src/runtime/rt.zc' in r.stderr and b'make clean' in r.stderr, r.stderr
     r = command(['build/bin/mkgenome'], b'zc: line 1: something is wrong\nzc: 1 error\n')
     assert r.returncode != 0 and b'something is wrong' in r.stderr and not r.stdout
-    print('ok   mkgenome roundtrip, truncation, alignment, map-header mutation and diagnostic contracts')
+    print('ok   mkgenome roundtrip, truncation, alignment, map-header mutation (naming FTOP, ZFP and both values) and diagnostic contracts')
 elif args.group == 'map':
     for preset in ['default', 'small', 'run', 'lsp', 'fixed']:
         with tempfile.TemporaryDirectory(prefix='tinyvm preset ') as directory: