Fix runtime tool output isolation, mmap64 chaining and DST ambiguity

This commit is contained in:
Leask Wong committed 2026-10-11 23:04:24 -04:00
1 parent 1c8f78a082
commit 8d9b7084f8
10 files changed
+341 -20

No files matched your search

+121
View File
@@ -0,0 +1,121 @@
"""Exercise output isolation with a synthetic toolchain; no network/DLL build."""
import hashlib
import json
import os
from pathlib import Path
import subprocess
import sys
import tempfile
import unittest
ROOT = Path(__file__).resolve().parents[2]
# Substitute only external source/compiler/archive commands. The real build.sh
# owns output checks, architecture iteration and manifest inputs.
FAKE_TOOL = r'''
import hashlib, json, os
from pathlib import Path
import sys
name = Path(sys.argv[0]).name
args = sys.argv[1:]
with open(os.environ['TOOL_CALLS'], 'a') as stream:
stream.write(name + '\n')
if name == 'git':
if args[0] == 'init':
Path(args[-1]).mkdir()
(Path(args[-1]) / 'LICENSE').write_text('synthetic public license')
elif 'rev-parse' in args:
print(os.environ['TEST_REVISION'])
elif name == 'meson':
if args[0] == 'setup':
p = Path(args[1]); p.mkdir()
p.joinpath('config.json').write_text(json.dumps({
'out': args[args.index('--prefix') + 1],
'arch': args[args.index('--bindir') + 1]}))
elif args[0] == 'install':
config = json.loads(Path(args[2], 'config.json').read_text())
out = Path(config['out'], config['arch']); out.mkdir(exist_ok=True)
out.joinpath('current.dll').write_bytes(b'synthetic current pinned DLL')
if config['arch'] == os.environ.get('FAIL_INSTALL_ARCH'):
sys.exit(5)
elif name == 'tar':
Path(args[args.index('-cf') + 1]).write_bytes(b'synthetic source archive')
elif name == 'sha256sum':
for arg in args:
print(hashlib.sha256(Path(arg).read_bytes()).hexdigest() + ' ' + arg)
elif name != 'python3':
raise AssertionError(name)
'''
class DxvkBuildTest(unittest.TestCase):
def setUp(self):
self.temporary = tempfile.TemporaryDirectory()
self.addCleanup(self.temporary.cleanup)
self.base = Path(self.temporary.name)
self.bin = self.base / 'bin'; self.bin.mkdir()
executable = self.bin / 'fake-tool'
executable.write_text('#!' + sys.executable + '\n' + FAKE_TOOL)
executable.chmod(0o755)
for name in ('git', 'meson', 'tar', 'sha256sum', 'python3'):
(self.bin / name).symlink_to(executable)
self.calls = self.base / 'calls'
self.env = dict(os.environ, PATH=str(self.bin) + os.pathsep + os.environ['PATH'],
TOOL_CALLS=str(self.calls))
source_env = ROOT / 'tools/dxvk/source.env'
self.env['TEST_REVISION'] = next(line.split('=', 1)[1].strip('"\'')
for line in source_env.read_text().splitlines()
if line.startswith('DXVK_REVISION='))
self.output = self.base / 'component'
def build(self):
return subprocess.run(['bash', str(ROOT / 'tools/dxvk/build.sh'), str(self.output)],
env=self.env, capture_output=True, text=True, timeout=10)
def test_stale_dll_is_rejected_untouched_before_fetch(self):
stale = self.output / 'x32/stale.dll'; stale.parent.mkdir(parents=True)
stale.write_bytes(b'prior pinned build')
result = self.build()
self.assertNotEqual(result.returncode, 0)
self.assertIn('output directory must be empty', result.stderr)
self.assertEqual(stale.read_bytes(), b'prior pinned build')
self.assertFalse(self.calls.exists())
self.assertFalse((self.output / 'SHA256SUMS').exists())
def test_hidden_contents_are_also_rejected(self):
self.output.mkdir(); (self.output / '.previous').write_text('retained')
self.assertNotEqual(self.build().returncode, 0)
self.assertFalse(self.calls.exists())
self.assertEqual((self.output / '.previous').read_text(), 'retained')
def test_empty_or_new_output_contains_only_current_dlls(self):
for existing in (False, True):
with self.subTest(existing=existing):
self.output = self.base / ('existing' if existing else 'new')
if existing: self.output.mkdir()
result = self.build()
self.assertEqual(result.returncode, 0, result.stderr)
rows = (self.output / 'SHA256SUMS').read_text().splitlines()
self.assertEqual([row.split(' ')[1] for row in rows],
['x32/current.dll', 'x64/current.dll'])
for row in rows:
digest, path = row.split(' ')
self.assertEqual(digest, hashlib.sha256((self.output / path).read_bytes()).hexdigest())
def test_partial_build_is_not_reused_or_deleted(self):
self.env['FAIL_INSTALL_ARCH'] = 'x64'
result = self.build()
self.assertEqual(result.returncode, 5, result.stderr)
before = {str(p.relative_to(self.output)): p.read_bytes()
for p in self.output.rglob('*') if p.is_file()}
self.calls.unlink(); del self.env['FAIL_INSTALL_ARCH']
result = self.build()
self.assertNotEqual(result.returncode, 0)
self.assertFalse(self.calls.exists())
after = {str(p.relative_to(self.output)): p.read_bytes()
for p in self.output.rglob('*') if p.is_file()}
self.assertEqual(after, before)
if __name__ == '__main__':
unittest.main()
@@ -28,6 +28,36 @@ class ResetProjectionTest(unittest.TestCase):
self.assertEqual(result['status'], 'stale_entry_not_attributed_to_current_trial')
self.assertNotIn('categories', result)
def test_repeated_dst_hour_is_ambiguous_before_freshness(self):
raw = '2026-11-01 01:30:00 SYSTEM_LAST_KMSG\nGNOC error type 0x2000'
for after in (None, datetime(2026, 11, 1, 6, tzinfo=timezone.utc)):
with self.subTest(after=after):
result = module.kernel_projection(raw, 'America/Toronto', after)
self.assertEqual(result['status'], 'ambiguous_device_local_time')
self.assertNotIn('entry_date_utc', result)
self.assertNotIn('categories', result)
self.assertNotIn('hardware_fields', result)
def test_skipped_dst_hour_is_not_a_real_instant(self):
raw = '2026-03-08 02:30:00 SYSTEM_LAST_KMSG\nGNOC error type 0x2000'
result = module.kernel_projection(raw, 'America/Toronto')
self.assertEqual(result['status'], 'nonexistent_device_local_time')
self.assertNotIn('entry_date_utc', result)
self.assertNotIn('categories', result)
def test_unambiguous_times_keep_correct_offsets_and_cutoff(self):
for stamp, expected in (('2026-11-01 00:30:00', '2026-11-01T04:30:00+00:00'),
('2026-11-01 02:30:00', '2026-11-01T07:30:00+00:00'),
('2026-03-08 03:30:00', '2026-03-08T07:30:00+00:00')):
with self.subTest(stamp=stamp):
raw = stamp + ' SYSTEM_LAST_KMSG\nGNOC'
result = module.kernel_projection(raw, 'America/Toronto')
self.assertEqual(result['entry_date_utc'], expected)
self.assertEqual(result['status'], 'projected_entry_not_a_root_cause')
cutoff = datetime.fromisoformat(expected)
self.assertEqual(module.kernel_projection(raw, 'America/Toronto', cutoff)['status'],
'projected_entry_not_a_root_cause')
def test_latest_entry_and_no_arbitrary_body(self):
raw = ('2026-10-10 20:10:09 SYSTEM_LAST_KMSG (text)\nGNOC error type 0x1111\n'
'2026-10-11 17:35:01 SYSTEM_LAST_KMSG (text)\n'