mirror of
https://git.triforceproject.com/triforce/source
synced 2026-11-19 16:20:01 -04:00
Triforce v0.3.4
The slowdown in fights and the controller whose buttons stopped arriving are fixed; the checks' file names; groundwork for Linux. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
@@ -153,7 +153,7 @@ class BuilderBuildJobsTests(unittest.TestCase):
|
||||
self.assertFalse(hasattr(harness.gui, "proc"))
|
||||
self.assertEqual(len(harness.events), 1)
|
||||
kind, title, message = harness.events[0]
|
||||
self.assertEqual((kind, title), ("error", "Hookshot"))
|
||||
self.assertEqual((kind, title), ("error", "Triforce"))
|
||||
self.assertIn("HOOKSHOT_JOBS", message)
|
||||
self.assertIn("0 for automatic", message)
|
||||
self.assertEqual(harness.environ, {"HOOKSHOT_JOBS": raw, "RX_JOBS": "2"})
|
||||
|
||||
@@ -83,7 +83,7 @@ class UpdateTests(unittest.TestCase):
|
||||
with self.subTest(case=label):
|
||||
case = root / label
|
||||
home = case / "home"
|
||||
versions = home / "hookshot" / "builder" / "versions"
|
||||
versions = home / "triforce" / "builder" / "versions"
|
||||
previous = versions / "v1"
|
||||
previous.mkdir(parents=True)
|
||||
(previous / "kept").write_bytes(b"previous version")
|
||||
@@ -197,7 +197,7 @@ class UpdateTests(unittest.TestCase):
|
||||
self.assertNotIn(linux_update.LIST_NAME, zipped.namelist())
|
||||
payloads[part.url] = archive.read_bytes()
|
||||
home = root / "publisher-home"
|
||||
versions = home / "hookshot" / "builder" / "versions"
|
||||
versions = home / "triforce" / "builder" / "versions"
|
||||
versions.mkdir(parents=True)
|
||||
canary = versions / "canary"
|
||||
canary.write_bytes(b"publisher sibling canary")
|
||||
@@ -217,7 +217,7 @@ class UpdateTests(unittest.TestCase):
|
||||
with self.subTest(target_exists=exists), tempfile.TemporaryDirectory(prefix="hookshot-stage-") as tmp:
|
||||
root = Path(tmp).resolve()
|
||||
home = root / "home"
|
||||
versions = home / "hookshot" / "builder" / "versions"
|
||||
versions = home / "triforce" / "builder" / "versions"
|
||||
versions.mkdir(parents=True)
|
||||
target = root / "outside-stage"
|
||||
sentinel = root / "sentinel"
|
||||
@@ -266,7 +266,7 @@ class UpdateTests(unittest.TestCase):
|
||||
if linked_home:
|
||||
home.symlink_to(real_home, target_is_directory=True)
|
||||
self.assertIn(root, home.resolve().parents)
|
||||
versions = home / "hookshot" / "builder" / "versions"
|
||||
versions = home / "triforce" / "builder" / "versions"
|
||||
old = versions / "v1"
|
||||
old.mkdir(parents=True)
|
||||
(old / "kept").write_text("old", encoding="utf-8")
|
||||
@@ -362,7 +362,7 @@ class UpdateTests(unittest.TestCase):
|
||||
for label, links in chains:
|
||||
with self.subTest(case=label), tempfile.TemporaryDirectory(prefix="hookshot-chain-") as tmp:
|
||||
home = Path(tmp).resolve() / "home"
|
||||
versions = home / "hookshot" / "builder" / "versions"
|
||||
versions = home / "triforce" / "builder" / "versions"
|
||||
versions.mkdir(parents=True)
|
||||
canary = versions / "canary"
|
||||
canary.write_bytes(b"canary")
|
||||
@@ -447,7 +447,7 @@ class UpdateTests(unittest.TestCase):
|
||||
root = Path(tmp) / "rc"
|
||||
appdir(root)
|
||||
(root / "usr" / "share" / "hookshot" / "VERSION").write_text("v1.1-rc.1\n", encoding="utf-8")
|
||||
(root / "hookshot-linux.txt").write_text(
|
||||
(root / "triforce-linux.txt").write_text(
|
||||
"tag v1.1-rc.1\npart %s 10 usr/share/hookshot file://%s/rc.zip\nfile nx2/marker.py\n" % ("a" * 64, tmp),
|
||||
encoding="utf-8")
|
||||
stable = "tag v1.0\npart %s 10 usr/share/hookshot https://example.invalid/old.zip\nfile nx2/marker.py\n" % ("b" * 64)
|
||||
@@ -466,7 +466,7 @@ class UpdateTests(unittest.TestCase):
|
||||
# an AppImage at the latest release keeps using its bundled list (nothing was ever reinstalled there)
|
||||
release = Path(tmp) / "release"
|
||||
appdir(release) # (VERSION v1)
|
||||
(release / "hookshot-linux.txt").write_text(
|
||||
(release / "triforce-linux.txt").write_text(
|
||||
"tag v1\npart %s 10 usr/share/hookshot file://%s/release.zip\nfile nx2/marker.py\n" % ("e" * 64, tmp),
|
||||
encoding="utf-8")
|
||||
same = "tag v1\npart %s 10 usr/share/hookshot https://example.invalid/old.zip\nfile nx2/marker.py\n" % ("b" * 64)
|
||||
@@ -489,7 +489,7 @@ class UpdateTests(unittest.TestCase):
|
||||
make_parts.main()
|
||||
finally:
|
||||
sys.argv = argv
|
||||
manifest = linux_update.parse_list((first / "hookshot-linux.txt").read_text(encoding="utf-8"))
|
||||
manifest = linux_update.parse_list((first / "triforce-linux.txt").read_text(encoding="utf-8"))
|
||||
home = root / "home"
|
||||
os.environ["HOOKSHOT_BUILDER_HOME"] = str(home)
|
||||
self.addCleanup(lambda: os.environ.pop("HOOKSHOT_BUILDER_HOME", None))
|
||||
@@ -502,7 +502,7 @@ class UpdateTests(unittest.TestCase):
|
||||
|
||||
linux_update.install(manifest, str(old), manifest, get=get)
|
||||
self.assertEqual(downloaded, [])
|
||||
installed = home / "hookshot" / "builder" / "versions" / "v1"
|
||||
installed = home / "triforce" / "builder" / "versions" / "v1"
|
||||
self.assertTrue((installed / "AppRun").stat().st_mode & stat.S_IXUSR)
|
||||
self.assertEqual((installed / "usr" / "share" / "hookshot" / "nx2" / "marker.py").read_text(encoding="utf-8"), "print('one')\n")
|
||||
|
||||
@@ -515,7 +515,7 @@ class UpdateTests(unittest.TestCase):
|
||||
make_parts.main()
|
||||
finally:
|
||||
sys.argv = argv
|
||||
nxt = linux_update.parse_list((second / "hookshot-linux.txt").read_text(encoding="utf-8"))
|
||||
nxt = linux_update.parse_list((second / "triforce-linux.txt").read_text(encoding="utf-8"))
|
||||
downloaded.clear()
|
||||
|
||||
def get2(url):
|
||||
@@ -526,10 +526,10 @@ class UpdateTests(unittest.TestCase):
|
||||
linux_update.install(nxt, str(installed), manifest, get=get2)
|
||||
self.assertEqual(len(downloaded), 1)
|
||||
self.assertIn("usr-share-hookshot", downloaded[0])
|
||||
built = home / "hookshot" / "builder" / "versions" / "v2"
|
||||
built = home / "triforce" / "builder" / "versions" / "v2"
|
||||
self.assertEqual((built / "usr" / "share" / "hookshot" / "nx2" / "marker.py").read_text(encoding="utf-8"), "print('two')\n")
|
||||
self.assertEqual((built / "usr" / "lib" / "hookshot" / "hookshot_vk.so").read_bytes(), b"vk")
|
||||
self.assertFalse((home / "hookshot" / "builder" / "versions" / "v1").exists())
|
||||
self.assertFalse((home / "triforce" / "builder" / "versions" / "v1").exists())
|
||||
|
||||
def test_an_installed_builder_finds_its_own_root(self):
|
||||
with tempfile.TemporaryDirectory(prefix="hookshot-root-") as tmp:
|
||||
@@ -575,11 +575,11 @@ class UpdateTests(unittest.TestCase):
|
||||
(out / name).write_bytes(b"old " + name.encode())
|
||||
with mock.patch.dict(os.environ, {"HOOKSHOT_TOOLS": str(ROOT)}):
|
||||
exec(finish, make_game.__dict__, {"built": str(built), "out": str(out), "work": str(work)})
|
||||
self.assertEqual((out / "hookshot").read_bytes(), (ROOT / "builder" / "linux" / "hookshot-folder").read_bytes())
|
||||
self.assertTrue((out / "hookshot").stat().st_mode & stat.S_IXUSR)
|
||||
self.assertEqual(sorted(p.name for p in out.iterdir()), ["bin", "hookshot", "image.bin"])
|
||||
self.assertEqual((out / make_game.BESIDE[0]).read_bytes(), (ROOT / "builder" / "linux" / "hookshot-folder").read_bytes())
|
||||
self.assertTrue((out / make_game.BESIDE[0]).stat().st_mode & stat.S_IXUSR)
|
||||
self.assertEqual(sorted(p.name for p in out.iterdir()), sorted(["bin", make_game.BESIDE[0], "image.bin"]))
|
||||
self.assertEqual(sorted(p.name for p in (out / "bin").iterdir()), sorted(make_game.BESIDE))
|
||||
self.assertEqual((out / "bin" / "hookshot").read_bytes(), b"new hookshot")
|
||||
self.assertEqual((out / "bin" / make_game.BESIDE[0]).read_bytes(), b"new " + make_game.BESIDE[0].encode())
|
||||
|
||||
def test_the_sysroot_path_is_not_part_of_an_object_key(self):
|
||||
import build
|
||||
@@ -617,14 +617,14 @@ class UpdateTests(unittest.TestCase):
|
||||
|
||||
def test_the_folder_launcher_finds_the_builder_under_the_builder_home(self):
|
||||
# HOOKSHOT_BUILDER_HOME is the data directory, as XDG_DATA_HOME is: linux_update installs to
|
||||
# <home>/hookshot/builder and host/hos_update.c looks there, so the launcher must too
|
||||
# <home>/triforce/builder and host/hos_update.c looks there, so the launcher must too
|
||||
with tempfile.TemporaryDirectory(prefix="hookshot-folder-") as tmp:
|
||||
root = Path(tmp)
|
||||
game = root / "game"
|
||||
(game / "bin").mkdir(parents=True)
|
||||
home = root / "home"
|
||||
started = root / "started"
|
||||
installed = home / "hookshot" / "builder"
|
||||
installed = home / "triforce" / "builder"
|
||||
(installed / "versions" / "v9").mkdir(parents=True)
|
||||
(installed / "current").write_text("v9\n", encoding="utf-8")
|
||||
apprun = installed / "versions" / "v9" / "AppRun"
|
||||
|
||||
@@ -190,7 +190,7 @@ class LinuxBuilderDlssTests(unittest.TestCase):
|
||||
self.assertIn("https://github.com/NVIDIA/DLSS/blob/", self.builder.DLSS_LICENSE)
|
||||
self.assertIn("never share a game folder built with them", self.builder.DLSS_LICENSE)
|
||||
with mock.patch.dict(os.environ, {"HOOKSHOT_BUILDER_HOME": str(self.root)}):
|
||||
sdk = str(self.root / "hookshot" / "builder" / "ngx-sdk")
|
||||
sdk = str(self.root / "triforce" / "builder" / "ngx-sdk")
|
||||
self.assertEqual(self.builder.ngx_sdk_dir(), sdk)
|
||||
env_off = self.builder.make_game_env(False, {"HOOKSHOT_NGX_SDK": "/stale", "HOOKSHOT_VK_PREBUILT": "/app/hookshot_vk.so"})
|
||||
self.assertNotIn("HOOKSHOT_NGX_SDK", env_off)
|
||||
|
||||
Reference in New Issue
Block a user