diff --git a/tools/check_p23_life_observation_evidence.py b/tools/check_p23_life_observation_evidence.py index 048ead2..9f80b39 100644 --- a/tools/check_p23_life_observation_evidence.py +++ b/tools/check_p23_life_observation_evidence.py @@ -1161,7 +1161,7 @@ def inspect_os_requests(directory, layout, role, pid, root=ROOT): def inspect_native_phases(directory, index, root=ROOT): runner = module('p23_existing_runner_checks', root/'tools/run_all_tests.py') - expected = ['runs/'+name+'/'+name+'-receipt.json' for name in ('import', 'parse', 'layout-A', 'layout-B')] + expected = ['runs/'+name+'/'+name+'-receipt.json' for name in ('import', 'parse', 'layout-a', 'layout-b')] require(index['phases'] == expected, 'native phase coverage/order') for name in expected: path = directory/name diff --git a/tools/run_p23_life_observation.py b/tools/run_p23_life_observation.py index fe5fc72..6592539 100644 --- a/tools/run_p23_life_observation.py +++ b/tools/run_p23_life_observation.py @@ -129,7 +129,7 @@ def collect_os(r, root, out, stage, engine, commit, refs, protected, outer): r.require(shutil.disk_usage(out).free >= 500*1024*1024, 'OS disk admission') folder = out/'os-runs'/label folder.mkdir(parents=True) - name = 'TheTree-PCK-tests-'+uuid.uuid4().hex+'-p23-observation-'+label + name = 'TheTree-PCK-tests-'+uuid.uuid4().hex+'-p23-observation-'+label.lower() profile = r.profile_path(name) r.require(not profile.exists(), 'fresh OS private profile') formal_source = pair/'formal' if role == 'reader' else None @@ -306,7 +306,7 @@ def collect(args): for layout in ('A', 'B'): directory = out/('layout-'+layout) os.environ.update(P23_LAYOUT=layout, P23_OUTPUT=str(directory)) - phase('layout-'+layout, 'tests/ui/test_p23_life_observation.gd') + phase('layout-'+layout.lower(), 'tests/ui/test_p23_life_observation.gd') cases.append({'directory':directory.name, 'phase':phases[-1], 'files':r.inventory(directory)}) if args.input_mode == 'native_os': os_phases = collect_os(r, root, out, stage, engine, commit, refs, protected, outer)