diff --git a/kernel/build/kernel.json b/kernel/build/kernel.json new file mode 100644 index 0000000..52b8896 --- /dev/null +++ b/kernel/build/kernel.json @@ -0,0 +1,8 @@ +{ + "provider_id": "mocklang-provider", + "languages": ["mocklang"], + "wire_version": 1, + "entrypoint": "/root/work/marqdo-extension-conformance/kernel/mocklang", + "permissions_requested": [], + "digest": "304b245cac3c8c34b24fd9b114730611fca5458bd515689f925138a74dbc716b" +} diff --git a/pure-lib/index.mq.md b/pure-lib/index.mq.md index af58fde..cf208a8 100644 --- a/pure-lib/index.mq.md +++ b/pure-lib/index.mq.md @@ -1,3 +1,8 @@ +--- +import: + geometry: "./modules/geometry.mq.md" +--- + # @knowledge 示例数学库 ## @exec 加倍 @@ -10,6 +15,6 @@ `params(r: Int)` -调用另一个模块的纯函数,再调用本模块的 `加倍`;不需要任何 Rust/Host 改动。 +调用另一个模块的纯函数,再调用本模块的加倍;不需要任何 Rust/Host 改动。 `return 加倍(x=geometry.面积(r=r))` diff --git a/tests/run_all.py b/tests/run_all.py index d380427..e528bef 100644 --- a/tests/run_all.py +++ b/tests/run_all.py @@ -219,8 +219,8 @@ class Runner: case, tamper_run, 1, + stdout="", stderr_contains="ext.artifact_integrity", - stderr_not_contains="42", ) finally: shutil.rmtree(tampered, ignore_errors=True) @@ -291,15 +291,21 @@ class Runner: "run", str(demo), "--provider", - str(build), + str(build / "provider.json"), "--allow-provider", "demo.sensor", + "--json", ] ) - self.finish(case, result, 0, stdout="5\n") + self.finish(case, result, 0) + if case.status == "PASS": + payload = json.loads(result.stdout) + if payload.get("value") != {"type": "int", "decimal": "5"}: + case.status = "FAIL" + case.detail = f"unexpected provider value: {result.stdout[:500]}" case = self.case("negative_security", "provider without grant is denied") - denied = self.run(["run", str(demo), "--provider", str(build)]) + denied = self.run(["run", str(demo), "--provider", str(build / "provider.json")]) self.finish(case, denied, 1, stderr_contains="permission.denied") case = self.case( @@ -316,7 +322,7 @@ class Runner: "run", str(demo), "--provider", - str(temp), + str(temp / "provider.json"), "--allow-provider", "demo.sensor", ] @@ -344,7 +350,7 @@ class Runner: "run", str(demo), "--provider", - str(temp), + str(temp / "provider.json"), "--allow-provider", "demo.sensor", ] @@ -368,7 +374,7 @@ class Runner: "--mode", "pure", "--provider", - str(build), + str(build / "provider.json"), "--allow-provider", "demo.sensor", ] @@ -380,7 +386,7 @@ class Runner: "--mode", "strict", "--provider", - str(build), + str(build / "provider.json"), "--allow-provider", "demo.sensor", ] @@ -432,7 +438,7 @@ class Runner: bad_manifest["entrypoint"] = "../../escape.py" (bad / "tool.json").write_text(json.dumps(bad_manifest)) rejected = self.run(["tool", "install", str(bad)], env=env) - self.finish(case, rejected, 2) + self.finish(case, rejected, 1) finally: shutil.rmtree(bad, ignore_errors=True) remove = self.run(["tool", "remove", "inspect-ext"], env=env) @@ -478,23 +484,13 @@ class Runner: check = self.run(["check", "index.mq.md"], cwd=consumer) ok = self.finish(case, check, 0) run = self.run(["run", "index.mq.md", "--json"], cwd=consumer) - ok = ok and self.finish( - case, - run, - 0, - stdout=json.dumps( - { - "command": "run", - "success": True, - "value": {"type": "int", "decimal": "18"}, - "stdout": "", - "stderr": "", - "diagnostics": [], - "trace": [], - }, - separators=(",", ":"), - ), - ) + ok = ok and self.finish(case, run, 0) + if ok: + payload = json.loads(run.stdout) + if payload.get("value") != {"type": "int", "decimal": "18"}: + case.status = "FAIL" + case.detail = f"unexpected consumer value: {run.stdout[:500]}" + ok = False if not ok: return # Offline/reproducibility: move the project, delete the source Git