Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .nanvix/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ venv
cache
sysroot
buildroot
out
.yamllint.yml
black.toml
env.json
Expand Down
19 changes: 4 additions & 15 deletions .nanvix/z.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ def build(self) -> None:

# Build artifacts to copy back from the container to the host after
# the Windows single-shot build completes. Two categories:
# * legacy repo-root paths needed at runtime (sqlite3.elf is
# resolved by make_initrd via repo_root()/app);
# * legacy repo-root paths needed at runtime (sqlite3.elf is read
# from repo_root() by the standalone test callsite below);
# * install-staged paths under .nanvix/out/release/{lib,include,bin}
# required by `./z release` (see _staged_output_files()).
_WINDOWS_OUTPUT_FILES = [
Expand Down Expand Up @@ -364,7 +364,7 @@ def _run_functional_standalone(self) -> None:
print(" Running sqlite3.elf via nanvixd standalone...")

# Bundle sqlite3.elf + daemons into an initrd.
initrd = make_initrd(self, "sqlite3.elf", test=True)
initrd = make_initrd(self, repo_root() / "sqlite3.elf", test_out())
Comment on lines 366 to +367

sql_file = repo_root() / ".nanvix" / "functional_test.sql"

Expand Down Expand Up @@ -468,18 +468,9 @@ def _run_tests_windows(self) -> None:
for binary in test_binaries:
name = binary.stem
print(f"RUN {name}...")
# make_initrd resolves binaries relative to repo_root;
# copy the ELF there temporarily unless it already lives there.
repo_elf = repo_root() / binary.name
copied_elf = False
if binary.resolve() != repo_elf.resolve():
# Preserve a pre-existing repo-root ELF on cleanup.
preexisted = repo_elf.exists()
shutil.copy2(binary, repo_elf)
copied_elf = not preexisted
initrd: Path | None = None
try:
initrd = make_initrd(self, binary.name, test=True)
initrd = make_initrd(self, binary, test_out())
with tempfile.TemporaryDirectory(
Comment on lines 471 to 474
prefix=f"nanvix_{name}_",
ignore_cleanup_errors=True,
Expand Down Expand Up @@ -522,8 +513,6 @@ def _run_tests_windows(self) -> None:
finally:
if initrd is not None and initrd.exists():
initrd.unlink()
if copied_elf and repo_elf.exists():
repo_elf.unlink()

if failed:
msg = f"{len(failed)} test(s) failed: {' '.join(failed)}"
Expand Down
2 changes: 1 addition & 1 deletion .zutils-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.13.0
v0.14.0
Loading