diff --git a/tools/parity.py b/tools/parity.py index 143f8f79d..c7063f987 100644 --- a/tools/parity.py +++ b/tools/parity.py @@ -654,6 +654,7 @@ class LocalExecutor: self.name, self.jobs, self.memory_budget, self.timeout = HOST, jobs, memory_budget, timeout self.max_peak = max_peak # set while other machines can take heavier harnesses self.running = {} + self.dead = False # this machine never drops out, unlike a remote host self.available, self.measured = 0, 0.0 (STATE_DIR / "logs").mkdir(parents=True, exist_ok=True) (STATE_DIR / "traces").mkdir(parents=True, exist_ok=True) diff --git a/tools/parity_hosts.json b/tools/parity_hosts.json index a9baa409c..2a2e5222e 100644 --- a/tools/parity_hosts.json +++ b/tools/parity_hosts.json @@ -14,7 +14,9 @@ "jobs": 14, "exclude": { "options": "Rust's f64::powf uses the platform libm, which rounds differently on macOS", - "chunk_generation": "one ocean ruined portal differs on macOS (platform float math)" + "chunk_generation": "one ocean ruined portal differs on macOS (platform float math)", + "world_border_render": "the wall's alpha differs by one ulp on macOS (platform float math)", + "mob_ai": "mob movement differs on macOS (platform float math in random positions)" } }, "thinkpad": { diff --git a/tools/test_server_files_parity.py b/tools/test_server_files_parity.py index af285e382..735bca302 100644 --- a/tools/test_server_files_parity.py +++ b/tools/test_server_files_parity.py @@ -132,7 +132,9 @@ def make_cases(build): root.mkdir(parents=True) count = 0 for name, data in properties_cases(): - d = root / name + # Numbered: macOS file systems ignore case, and eula-true and + # eula-TRUE must not share a folder. + d = root / f'{count:04d}-{name}' d.mkdir() if data is None: (d / 'properties.default').write_bytes(b'') @@ -140,7 +142,9 @@ def make_cases(build): (d / 'server.properties').write_bytes(data) count += 1 for name, data in eula_cases(): - d = root / name + # Numbered: macOS file systems ignore case, and eula-true and + # eula-TRUE must not share a folder. + d = root / f'{count:04d}-{name}' d.mkdir() if data is None: (d / 'eula.missing').write_bytes(b'') @@ -148,7 +152,9 @@ def make_cases(build): (d / 'eula.txt').write_bytes(data) count += 1 for name, files in list_cases(): - d = root / name + # Numbered: macOS file systems ignore case, and eula-true and + # eula-TRUE must not share a folder. + d = root / f'{count:04d}-{name}' d.mkdir() for f, text in files.items(): (d / f).write_text(text, encoding='utf-8')