From a25d57dc5bec9599402a5631ad647490a10c5bd0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Jun 2025 00:31:49 +0200 Subject: [PATCH] buildOctavePackage: add octave 'pkg test' passthru test test successes: * `octavePackages.bim.tests.testOctavePkgTests` -> `/nix/store/rvm4zzmb41gfvda04fzacfbav1kkr7a0-octave-10.1.0-bim-1.1.6-pkg-test` * `octavePackages.bsltl.tests.testOctavePkgTests` -> `/nix/store/khldlkk16g6f9iyxwpzi5mrlxfy66n25-octave-10.1.0-bsltl-1.3.1-pkg-test` * `octavePackages.cgi.tests.testOctavePkgTests` -> `/nix/store/k742s20zh6zmhlm0jsn0af7wlij265iq-octave-10.1.0-cgi-0.1.2-pkg-test` * `octavePackages.communications.tests.testOctavePkgTests` -> `/nix/store/38kpxq4p7bl619grvlmgl15h0d54l6vr-octave-10.1.0-communications-1.2.7-pkg-test` * `octavePackages.dataframe.tests.testOctavePkgTests` -> `/nix/store/7svdgvbhd04dl2j89g18n8mi21bfhj41-octave-10.1.0-dataframe-1.2.0-pkg-test` * `octavePackages.dicom.tests.testOctavePkgTests` -> `/nix/store/9g4wpr0j49hghjzn054lpl00zlg936nx-octave-10.1.0-dicom-0.6.1-pkg-test` * `octavePackages.divand.tests.testOctavePkgTests` -> `/nix/store/rja901hkzlkyrqrvg7qbdf3d4jabj9my-octave-10.1.0-divand-1.1.2-pkg-test` * `octavePackages.doctest.tests.testOctavePkgTests` -> `/nix/store/5dxnn1hrc184zlpvy00cs10szwlqmgpd-octave-10.1.0-doctest-0.8.0-pkg-test` * `octavePackages.fpl.tests.testOctavePkgTests` -> `/nix/store/4ixfranhmz824rlzqa34l2snf6xqbnsl-octave-10.1.0-fpl-1.3.5-pkg-test` * `octavePackages.fuzzy-logic-toolkit.tests.testOctavePkgTests` -> `/nix/store/d91hadx59bv0cw0a7z8zdx48inha8bji-octave-10.1.0-fuzzy-logic-toolkit-0.6.1-pkg-test` * `octavePackages.ga.tests.testOctavePkgTests` -> `/nix/store/2jwhq7iv54aqzshg4m8xq3h8plxrihfn-octave-10.1.0-ga-0.10.4-pkg-test` * `octavePackages.general.tests.testOctavePkgTests` -> `/nix/store/bjd00kl6m86fz9cp70ai6jni6jfijw2g-octave-10.1.0-general-2.1.3-pkg-test` * `octavePackages.generate_html.tests.testOctavePkgTests` -> `/nix/store/29z3q919nzrkd2afzr7i9c325fk8h966-octave-10.1.0-generate_html-0.3.3-pkg-test` * `octavePackages.io.tests.testOctavePkgTests` -> `/nix/store/qpj69a8swl3rzs039fkyf77krb3nbqf6-octave-10.1.0-io-2.7.0-pkg-test` * `octavePackages.linear-algebra.tests.testOctavePkgTests` -> `/nix/store/x28qgln5fww84z8sjr5ynnh4h9yxhhz7-octave-10.1.0-linear-algebra-2.2.3-pkg-test` * `octavePackages.matgeom.tests.testOctavePkgTests` -> `/nix/store/f7r4rvv6czh56phmf67ihn7ki7p0j7fa-octave-10.1.0-matgeom-1.2.4-pkg-test` * `octavePackages.miscellaneous.tests.testOctavePkgTests` -> `/nix/store/1vp5vpi3fgbw5bwf409vsz1q9n7qvwv4-octave-10.1.0-miscellaneous-1.3.1-pkg-test` * `octavePackages.mvn.tests.testOctavePkgTests` -> `/nix/store/882fwfw2yda00qv021ih45agx0iqimcm-octave-10.1.0-mvn-1.1.0-pkg-test` * `octavePackages.netcdf.tests.testOctavePkgTests` -> `/nix/store/zdba74gxzh5xf4vnmhv36wjf81zy48jj-octave-10.1.0-netcdf-1.0.18-pkg-test` * `octavePackages.nurbs.tests.testOctavePkgTests` -> `/nix/store/jcm76br2zv1f4pmx2jvv63mqwd6pk1wi-octave-10.1.0-nurbs-1.4.4-pkg-test` * `octavePackages.octclip.tests.testOctavePkgTests` -> `/nix/store/6phn6qz154i3861gswx50bwaa76kf2nh-octave-10.1.0-octclip-2.0.3-pkg-test` * `octavePackages.octproj.tests.testOctavePkgTests` -> `/nix/store/ylllvmg0via7i99rf121znwq4dr9k4b9-octave-10.1.0-octproj-3.0.2-pkg-test` * `octavePackages.optics.tests.testOctavePkgTests` -> `/nix/store/407nl9b2j85z22p163xsiy94rd4sczrz-octave-10.1.0-optics-0.1.4-pkg-test` * `octavePackages.optiminterp.tests.testOctavePkgTests` -> `/nix/store/a7yq31rp93a37fwz269f7qra3qc2kjr7-octave-10.1.0-optiminterp-0.3.7-pkg-test` * `octavePackages.quaternion.tests.testOctavePkgTests` -> `/nix/store/fxb9gwljpqyidl1v21y5782fl9v08bbp-octave-10.1.0-quaternion-2.4.0-pkg-test` * `octavePackages.sockets.tests.testOctavePkgTests` -> `/nix/store/jcgbc9g54s49d82xq19ifxjzx45f1pdx-octave-10.1.0-sockets-1.4.1-pkg-test` * `octavePackages.splines.tests.testOctavePkgTests` -> `/nix/store/sydyfjl35z4snh45bjk79n5vxqps42iq-octave-10.1.0-splines-1.3.5-pkg-test` * `octavePackages.strings.tests.testOctavePkgTests` -> `/nix/store/ksx4g1axic4lgqkk2551winz3sdk6bsy-octave-10.1.0-strings-1.3.1-pkg-test` * `octavePackages.struct.tests.testOctavePkgTests` -> `/nix/store/ib8pmcjwyga08s3qq9mv04g5421796q7-octave-10.1.0-struct-1.0.18-pkg-test` * `octavePackages.tsa.tests.testOctavePkgTests` -> `/nix/store/d2c2fjr9b5fxaaw571a299v5h2jxmj56-octave-10.1.0-tsa-4.6.3-pkg-test` * `octavePackages.windows.tests.testOctavePkgTests` -> `/nix/store/dp5rwkr9li4w5346ibl3fyrs9p0l566j-octave-10.1.0-windows-1.6.5-pkg-test` * `octavePackages.zeromq.tests.testOctavePkgTests` -> `/nix/store/39zr8n4ccyxi94hkpk95p1h13v9kw4n8-octave-10.1.0-zeromq-1.5.5-pkg-test` test failures: * `octavePackages.audio.tests.testOctavePkgTests` * `octavePackages.control.tests.testOctavePkgTests` * `octavePackages.database.tests.testOctavePkgTests` * `octavePackages.geometry.tests.testOctavePkgTests` * `octavePackages.image-acquisition.tests.testOctavePkgTests` * `octavePackages.image.tests.testOctavePkgTests` * `octavePackages.instrument-control.tests.testOctavePkgTests` * `octavePackages.interval.tests.testOctavePkgTests` * `octavePackages.lssa.tests.testOctavePkgTests` * `octavePackages.msh.tests.testOctavePkgTests` * `octavePackages.nan.tests.testOctavePkgTests` * `octavePackages.ncarray.tests.testOctavePkgTests` * `octavePackages.signal.tests.testOctavePkgTests` * `octavePackages.statistics.tests.testOctavePkgTests` * `octavePackages.stk.tests.testOctavePkgTests` * `octavePackages.symbolic.tests.testOctavePkgTests` * `octavePackages.video.tests.testOctavePkgTests` --- .../octave/build-octave-package.nix | 151 +++++++++--------- .../interpreters/octave/run-pkg-test.nix | 25 +++ 2 files changed, 101 insertions(+), 75 deletions(-) create mode 100644 pkgs/development/interpreters/octave/run-pkg-test.nix diff --git a/pkgs/development/interpreters/octave/build-octave-package.nix b/pkgs/development/interpreters/octave/build-octave-package.nix index a040eb49b206..8fc219d00d74 100644 --- a/pkgs/development/interpreters/octave/build-octave-package.nix +++ b/pkgs/development/interpreters/octave/build-octave-package.nix @@ -9,6 +9,7 @@ stdenv, config, octave, + callPackage, texinfo, computeRequiredOctavePackages, writeRequiredOctavePackagesHook, @@ -64,20 +65,6 @@ let writeRequiredOctavePackagesHook ] ++ nativeBuildInputs; - passthru' = - { - updateScript = [ - ../../../../maintainers/scripts/update-octave-packages - (builtins.unsafeGetAttrPos "pname" octave.pkgs.${attrs.pname}).file - ]; - } - // passthru - // { - tests = { - testOctaveBuildEnv = octave.withPackages (ps: [ self ]); - } // passthru.tests or { }; - }; - # This step is required because when # a = { test = [ "a" "b" ]; }; b = { test = [ "c" "d" ]; }; # (a // b).test = [ "c" "d" ]; @@ -88,65 +75,79 @@ let "nativeBuildInputs" "passthru" ]; - - self = stdenv.mkDerivation ( - { - packageName = "${fullLibName}"; - # The name of the octave package ends up being - # "octave-version-package-version" - name = "${octave.pname}-${octave.version}-${fullLibName}"; - - # This states that any package built with the function that this returns - # will be an octave package. This is used for ensuring other octave - # packages are installed into octave during the environment building phase. - isOctavePackage = true; - - OCTAVE_HISTFILE = "/dev/null"; - - inherit src; - - inherit dontPatch patches patchPhase; - - dontConfigure = true; - - enableParallelBuilding = enableParallelBuilding; - - requiredOctavePackages = requiredOctavePackages'; - - nativeBuildInputs = nativeBuildInputs'; - - buildInputs = buildInputs ++ requiredOctavePackages'; - - propagatedBuildInputs = propagatedBuildInputs ++ [ texinfo ]; - - preBuild = - if preBuild == "" then - '' - # This trickery is needed because Octave expects a single directory inside - # at the top-most level of the tarball. - tar --transform 's,^,${fullLibName}/,' -cz * -f ${fullLibName}.tar.gz - '' - else - preBuild; - - buildPhase = '' - runHook preBuild - - mkdir -p $out - octave-cli --eval "pkg build $out ${fullLibName}.tar.gz" - - runHook postBuild - ''; - - # We don't install here, because that's handled when we build the environment - # together with Octave. - dontInstall = true; - - passthru = passthru'; - - inherit meta; - } - // attrs' - ); in -self +stdenv.mkDerivation ( + finalAttrs: + { + packageName = "${fullLibName}"; + # The name of the octave package ends up being + # "octave-version-package-version" + name = "${octave.pname}-${octave.version}-${fullLibName}"; + + # This states that any package built with the function that this returns + # will be an octave package. This is used for ensuring other octave + # packages are installed into octave during the environment building phase. + isOctavePackage = true; + + OCTAVE_HISTFILE = "/dev/null"; + + inherit src; + + inherit dontPatch patches patchPhase; + + dontConfigure = true; + + enableParallelBuilding = enableParallelBuilding; + + requiredOctavePackages = requiredOctavePackages'; + + nativeBuildInputs = nativeBuildInputs'; + + buildInputs = buildInputs ++ requiredOctavePackages'; + + propagatedBuildInputs = propagatedBuildInputs ++ [ texinfo ]; + + preBuild = + if preBuild == "" then + '' + # This trickery is needed because Octave expects a single directory inside + # at the top-most level of the tarball. + tar --transform 's,^,${fullLibName}/,' -cz * -f ${fullLibName}.tar.gz + '' + else + preBuild; + + buildPhase = '' + runHook preBuild + + mkdir -p $out + octave-cli --eval "pkg build $out ${fullLibName}.tar.gz" + + runHook postBuild + ''; + + # We don't install here, because that's handled when we build the environment + # together with Octave. + dontInstall = true; + + passthru = + { + updateScript = [ + ../../../../maintainers/scripts/update-octave-packages + (builtins.unsafeGetAttrPos "pname" octave.pkgs.${attrs.pname}).file + ]; + } + // passthru + // { + tests = { + testOctaveBuildEnv = (octave.withPackages (os: [ finalAttrs.finalPackage ])).overrideAttrs (old: { + name = "${finalAttrs.name}-pkg-install"; + }); + testOctavePkgTests = callPackage ./run-pkg-test.nix { } finalAttrs.finalPackage; + } // passthru.tests or { }; + }; + + inherit meta; + } + // attrs' +) diff --git a/pkgs/development/interpreters/octave/run-pkg-test.nix b/pkgs/development/interpreters/octave/run-pkg-test.nix new file mode 100644 index 000000000000..4665fc92f527 --- /dev/null +++ b/pkgs/development/interpreters/octave/run-pkg-test.nix @@ -0,0 +1,25 @@ +{ + octave, + runCommand, +}: +package: + +runCommand "${package.name}-pkg-test" + { + nativeBuildInputs = [ + (octave.withPackages (os: [ package ])) + ]; + } + '' + { octave-cli --eval 'pkg test ${package.pname}' || touch FAILED_ERRCODE; } \ + |& tee >( grep --quiet '^Failure Summary:$' && touch FAILED_OUTPUT || : ; cat >/dev/null ) + if [[ -f FAILED_ERRCODE ]]; then + echo >&2 "octave-cli returned with non-zero exit code." + false + elif [[ -f FAILED_OUTPUT ]]; then + echo >&2 "Test failures detected in output." + false + else + touch $out + fi + ''