refactor(tvix/cli/default.nix): make eval tests and benches derivations
This makes the eval tests and benchmarks standalone Nix derivations and readTree targets: ``` nix-build -A tvix.cli.eval-nixpkgs-cross-hello-outpath nix-build -A tvix.cli.benchmark-nixpkgs-attrnames ``` Even without doing any fetches, We need to set `SSL_CERT_FILE`, so reqwest is able to load its CA roots. Change-Id: Ib45282d01044165c7816391adbeeb26334f8e924 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11493 Reviewed-by: raitobezarius <tvl@lahfa.xyz> Tested-by: BuildkiteCI Autosubmit: flokli <flokli@flokli.de>
This commit is contained in:
Florian Klink
clbot
parent
f3ec974895
commit
4124f0e679
1 changed files with 45 additions and 49 deletions
|
|
@ -1,23 +1,11 @@
|
|||
{ depot, pkgs, lib, ... }:
|
||||
|
||||
(depot.tvix.crates.workspaceMembers.tvix-cli.build.override {
|
||||
runTests = true;
|
||||
}).overrideAttrs (finalAttrs: previousAttrs:
|
||||
|
||||
let
|
||||
mkNixpkgsEvalCheck = attrset: expectedPath: {
|
||||
label = ":nix: evaluate nixpkgs.${attrset} in tvix";
|
||||
needsOutput = true;
|
||||
|
||||
command = pkgs.writeShellScript "tvix-eval-${builtins.replaceStrings [".drv"] ["-drv"] attrset}" ''
|
||||
TVIX_OUTPUT=$(result/bin/tvix -E '(import ${pkgs.path} {}).${attrset}')
|
||||
EXPECTED='${/* the verbatim expected Tvix output: */ "=> \"${builtins.unsafeDiscardStringContext expectedPath}\" :: string"}'
|
||||
|
||||
echo "Tvix output: ''${TVIX_OUTPUT}"
|
||||
if [ "$TVIX_OUTPUT" != "$EXPECTED" ]; then
|
||||
echo "Correct would have been ''${EXPECTED}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Output was correct."
|
||||
'';
|
||||
};
|
||||
tvix-cli = finalAttrs.finalPackage;
|
||||
|
||||
benchmark-gnutime-format-string =
|
||||
description:
|
||||
|
|
@ -30,24 +18,16 @@ let
|
|||
};
|
||||
});
|
||||
|
||||
in
|
||||
|
||||
(depot.tvix.crates.workspaceMembers.tvix-cli.build.override {
|
||||
runTests = true;
|
||||
}).overrideAttrs (finalAttrs: previousAttrs:
|
||||
|
||||
let
|
||||
tvix-cli = finalAttrs.finalPackage;
|
||||
|
||||
# You can run the benchmark with a simple `nix run`, like:
|
||||
#
|
||||
# nix run -f . tvix.cli.meta.ci.extraSteps.benchmark-nixpkgs-cross-hello-outpath
|
||||
# nix-build -A tvix.cli.meta.ci.extraSteps.benchmark-nixpkgs-cross-hello-outpath
|
||||
#
|
||||
# TODO(amjoseph): store these results someplace more durable, like git trailers
|
||||
#
|
||||
mkExprBenchmark = { expr, description }:
|
||||
let name = "tvix-cli-benchmark-${description}"; in
|
||||
(pkgs.writeShellScriptBin name ''
|
||||
(pkgs.runCommand name { } ''
|
||||
export SSL_CERT_FILE=${pkgs.cacert.out}/etc/ssl/certs/ca-bundle.crt
|
||||
${lib.escapeShellArgs [
|
||||
"${pkgs.time}/bin/time"
|
||||
"--format" "${benchmark-gnutime-format-string description}"
|
||||
|
|
@ -55,15 +35,8 @@ let
|
|||
"--no-warnings"
|
||||
"-E" expr
|
||||
]}
|
||||
'').overrideAttrs (finalAttrs: previousAttrs: {
|
||||
passthru = (previousAttrs.passthru or { }) // {
|
||||
ci = {
|
||||
label = ":nix: benchmark ${description} in tvix";
|
||||
needsOutput = true;
|
||||
command = "${finalAttrs.finalPackage}/bin/${finalAttrs.meta.mainProgram}";
|
||||
};
|
||||
};
|
||||
});
|
||||
touch $out
|
||||
'');
|
||||
|
||||
mkNixpkgsBenchmark = attrpath:
|
||||
mkExprBenchmark {
|
||||
|
|
@ -71,6 +44,28 @@ let
|
|||
expr = "(import ${pkgs.path} {}).${attrpath}";
|
||||
};
|
||||
|
||||
# Constructs a Derivation invoking tvix-cli inside a build, ensures the
|
||||
# calculated tvix output path matches what's passed in externally.
|
||||
mkNixpkgsEvalTest = attrpath: expectedPath:
|
||||
let
|
||||
name = "tvix-eval-test-${builtins.replaceStrings [".drv"] ["-drv"] attrpath}";
|
||||
in
|
||||
(pkgs.runCommand name { } ''
|
||||
export SSL_CERT_FILE=${pkgs.cacert.out}/etc/ssl/certs/ca-bundle.crt
|
||||
TVIX_OUTPUT=$(${tvix-cli}/bin/tvix -E '(import ${pkgs.path} {}).${attrpath}')
|
||||
EXPECTED='${/* the verbatim expected Tvix output: */ "=> \"${builtins.unsafeDiscardStringContext expectedPath}\" :: string"}'
|
||||
|
||||
echo "Tvix output: ''${TVIX_OUTPUT}"
|
||||
if [ "$TVIX_OUTPUT" != "$EXPECTED" ]; then
|
||||
echo "Correct would have been ''${EXPECTED}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Output was correct."
|
||||
touch $out
|
||||
'');
|
||||
|
||||
|
||||
benchmarks = {
|
||||
benchmark-hello = (mkNixpkgsBenchmark "hello.outPath");
|
||||
benchmark-cross-hello = (mkNixpkgsBenchmark "pkgsCross.aarch64-multiplatform.hello.outPath");
|
||||
|
|
@ -79,21 +74,22 @@ let
|
|||
# Example used for benchmarking LightSpan::Delayed in commit bf286a54bc2ac5eeb78c3d5c5ae66e9af24d74d4
|
||||
benchmark-nixpkgs-attrnames = (mkExprBenchmark { expr = "builtins.length (builtins.attrNames (import ${pkgs.path} {}))"; description = "nixpkgs-attrnames"; });
|
||||
};
|
||||
|
||||
evalTests = {
|
||||
eval-nixpkgs-stdenv-drvpath = (mkNixpkgsEvalTest "stdenv.drvPath" pkgs.stdenv.drvPath);
|
||||
eval-nixpkgs-stdenv-outpath = (mkNixpkgsEvalTest "stdenv.outPath" pkgs.stdenv.outPath);
|
||||
eval-nixpkgs-hello-outpath = (mkNixpkgsEvalTest "hello.outPath" pkgs.hello.outPath);
|
||||
eval-nixpkgs-firefox-outpath = (mkNixpkgsEvalTest "firefox.outPath" pkgs.firefox.outPath);
|
||||
eval-nixpkgs-firefox-drvpath = (mkNixpkgsEvalTest "firefox.drvPath" pkgs.firefox.drvPath);
|
||||
eval-nixpkgs-cross-stdenv-outpath = (mkNixpkgsEvalTest "pkgsCross.aarch64-multiplatform.stdenv.outPath" pkgs.pkgsCross.aarch64-multiplatform.stdenv.outPath);
|
||||
eval-nixpkgs-cross-hello-outpath = (mkNixpkgsEvalTest "pkgsCross.aarch64-multiplatform.hello.outPath" pkgs.pkgsCross.aarch64-multiplatform.hello.outPath);
|
||||
};
|
||||
in
|
||||
{
|
||||
meta = {
|
||||
ci.extraSteps = {
|
||||
eval-nixpkgs-stdenv-drvpath = (mkNixpkgsEvalCheck "stdenv.drvPath" pkgs.stdenv.drvPath);
|
||||
eval-nixpkgs-stdenv-outpath = (mkNixpkgsEvalCheck "stdenv.outPath" pkgs.stdenv.outPath);
|
||||
eval-nixpkgs-hello-outpath = (mkNixpkgsEvalCheck "hello.outPath" pkgs.hello.outPath);
|
||||
eval-nixpkgs-firefox-outpath = (mkNixpkgsEvalCheck "firefox.outPath" pkgs.firefox.outPath);
|
||||
eval-nixpkgs-firefox-drvpath = (mkNixpkgsEvalCheck "firefox.drvPath" pkgs.firefox.drvPath);
|
||||
eval-nixpkgs-cross-stdenv-outpath = (mkNixpkgsEvalCheck "pkgsCross.aarch64-multiplatform.stdenv.outPath" pkgs.pkgsCross.aarch64-multiplatform.stdenv.outPath);
|
||||
eval-nixpkgs-cross-hello-outpath = (mkNixpkgsEvalCheck "pkgsCross.aarch64-multiplatform.hello.outPath" pkgs.pkgsCross.aarch64-multiplatform.hello.outPath);
|
||||
};
|
||||
ci.targets = builtins.attrNames benchmarks;
|
||||
ci.targets = (builtins.attrNames benchmarks) ++ (builtins.attrNames evalTests);
|
||||
};
|
||||
|
||||
# Expose benchmarks as standard CI targets.
|
||||
passthru = benchmarks;
|
||||
# Expose benchmarks and evalTests as standard CI targets.
|
||||
passthru = benchmarks // evalTests;
|
||||
})
|
||||
|
|
|
|||
Loading…
Reference in a new issue