From 6e5adf9d60fadb833a271d423a6c5365a2ce9835 Mon Sep 17 00:00:00 2001 From: Sebastien Valat Date: Wed, 22 Apr 2026 11:12:47 +0200 Subject: [PATCH 1/3] ci: run the test via the new way (test.py && **/testme.json) --- .github/workflows/idefix-ci-jobs.yml | 90 ++++++++++++++-------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/.github/workflows/idefix-ci-jobs.yml b/.github/workflows/idefix-ci-jobs.yml index 847ba3cb..903bc88c 100644 --- a/.github/workflows/idefix-ci-jobs.yml +++ b/.github/workflows/idefix-ci-jobs.yml @@ -33,13 +33,13 @@ jobs: submodules: recursive persist-credentials: false - name: Sod test - run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/sod -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/HD/sod $TESTME_OPTIONS - name: Isothermal Sod test - run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/sod-iso -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/HD/sod-iso $TESTME_OPTIONS - name: Mach reflection test - run: scripts/ci/run-tests $IDEFIX_DIR/test/HD//MachReflection -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/HD/MachReflection $TESTME_OPTIONS - name: Sedov blast wave - run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/SedovBlastWave -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/HD/SedovBlastWave $TESTME_OPTIONS ParabolicHydro: runs-on: self-hosted @@ -50,11 +50,11 @@ jobs: submodules: recursive persist-credentials: false - name: Viscous flow past cylinder - run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/ViscousFlowPastCylinder -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/HD/ViscousFlowPastCylinder $TESTME_OPTIONS - name: Viscous disk - run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/ViscousDisk -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/HD/ViscousDisk $TESTME_OPTIONS - name: Thermal diffusion - run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/thermalDiffusion -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/HD/thermalDiffusion $TESTME_OPTIONS ShocksMHD: runs-on: self-hosted @@ -65,17 +65,17 @@ jobs: submodules: recursive persist-credentials: false - name: MHD Sod test - run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sod -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/MHD/sod $TESTME_OPTIONS - name: MHD Isothermal Sod test - run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sod-iso -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/MHD/sod-iso $TESTME_OPTIONS - name: Orszag Tang - run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/OrszagTang -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/MHD/OrszagTang $TESTME_OPTIONS - name: Orszag Tang 3D - run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/OrszagTang3D -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/MHD/OrszagTang3D $TESTME_OPTIONS - name: Linear wave test - run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/LinearWaveTest -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/MHD/LinearWaveTest $TESTME_OPTIONS - name: Axis Flux tube - run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/AxisFluxTube -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/MHD/AxisFluxTube $TESTME_OPTIONS ParabolicMHD: runs-on: self-hosted @@ -86,15 +86,15 @@ jobs: submodules: recursive persist-credentials: false - name: Ambipolar C Shock - run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/AmbipolarCshock -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/MHD/AmbipolarCshock $TESTME_OPTIONS - name: Ambipolar C Shock 3D - run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/AmbipolarCshock3D -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/MHD/AmbipolarCshock3D $TESTME_OPTIONS - name: Resistive Alfvén wave - run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/ResistiveAlfvenWave -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/MHD/ResistiveAlfvenWave $TESTME_OPTIONS - name: Grid coarsening diffusion - run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/Coarsening -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/MHD/Coarsening $TESTME_OPTIONS - name: Hall whistler waves - run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/HallWhistler -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/MHD/HallWhistler $TESTME_OPTIONS Fargo: needs: [ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD] @@ -106,9 +106,9 @@ jobs: submodules: recursive persist-credentials: false - name: Fargo + planet - run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/FargoPlanet -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/HD/FargoPlanet $TESTME_OPTIONS - name: Fargo MHD spherical - run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/FargoMHDSpherical -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/MHD/FargoMHDSpherical $TESTME_OPTIONS ShearingBox: needs: [ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD] @@ -120,9 +120,9 @@ jobs: submodules: recursive persist-credentials: false - name: Hydro shearing box - run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/ShearingBox -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/HD/ShearingBox $TESTME_OPTIONS - name: MHD shearing box - run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/ShearingBox -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/MHD/ShearingBox $TESTME_OPTIONS SelfGravity: needs: [ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD] @@ -134,15 +134,15 @@ jobs: submodules: recursive persist-credentials: false - name: Jeans Instability - run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/JeansInstability -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/SelfGravity/JeansInstability $TESTME_OPTIONS - name: Random sphere spherical - run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/RandomSphere -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/SelfGravity/RandomSphere $TESTME_OPTIONS - name: Random sphere cartesian - run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/RandomSphereCartesian -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/SelfGravity/RandomSphereCartesian $TESTME_OPTIONS - name: Uniform spherical collapse - run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/UniformCollapse -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/SelfGravity/UniformCollapse $TESTME_OPTIONS - name: Dusty spherical collapse - run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/DustyCollapse -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/SelfGravity/DustyCollapse $TESTME_OPTIONS Planet: needs: [ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD] @@ -154,17 +154,17 @@ jobs: submodules: recursive persist-credentials: false - name: 3 body - run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/Planet3Body -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/Planet/Planet3Body $TESTME_OPTIONS - name: migration - run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetMigration2D -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/Planet/PlanetMigration2D $TESTME_OPTIONS - name: planet-planet - run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetPlanetRK42D -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/Planet/PlanetPlanetRK42D $TESTME_OPTIONS - name: spiral wake - run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetSpiral2D -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/Planet/PlanetSpiral2D $TESTME_OPTIONS - name: torques - run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetTorque3D -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/Planet/PlanetTorque3D $TESTME_OPTIONS - name: RK5 - run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetsIsActiveRK52D -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/Planet/PlanetsIsActiveRK52D $TESTME_OPTIONS Dust: needs: [ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD] @@ -176,9 +176,9 @@ jobs: submodules: recursive persist-credentials: false - name: Energy conservation - run: scripts/ci/run-tests $IDEFIX_DIR/test/Dust/DustEnergy -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/Dust/DustEnergy $TESTME_OPTIONS - name: Dusty wave - run: scripts/ci/run-tests $IDEFIX_DIR/test/Dust/DustyWave -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/Dust/DustyWave $TESTME_OPTIONS Braginskii: needs: [ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD] @@ -190,13 +190,13 @@ jobs: submodules: recursive persist-credentials: false - name: MTI - run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/MTI -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/MHD/MTI $TESTME_OPTIONS - name: Spherical anisotropic diffusion - run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sphBragTDiffusion -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/MHD/sphBragTDiffusion $TESTME_OPTIONS - name: Spherical anisotropic viscosity - run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sphBragViscosity -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/MHD/sphBragViscosity $TESTME_OPTIONS - name: Collisionless thermal conduction - run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/clessTDiffusion -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/MHD/clessTDiffusion $TESTME_OPTIONS Examples: needs: [Fargo, Dust, Planet, ShearingBox, SelfGravity] @@ -220,11 +220,11 @@ jobs: submodules: recursive persist-credentials: false - name: Lookup table - run: scripts/ci/run-tests $IDEFIX_DIR/test/utils/lookupTable -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/utils/lookupTable $TESTME_OPTIONS - name: Dump Image - run: scripts/ci/run-tests $IDEFIX_DIR/test/utils/dumpImage -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/utils/dumpImage $TESTME_OPTIONS - name: Column density - run: scripts/ci/run-tests $IDEFIX_DIR/test/utils/columnDensity -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/utils/columnDensity $TESTME_OPTIONS IOs: needs: [Fargo, Dust, Planet, ShearingBox, SelfGravity] @@ -236,13 +236,13 @@ jobs: submodules: recursive persist-credentials: false - name: Restart dumps - run: scripts/ci/run-tests $IDEFIX_DIR/test/IO/dump -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/IO/dump $TESTME_OPTIONS - name: Pydefix run: | python3 -m venv $IDEFIX_DIR/test/IO/pydefix/env source $IDEFIX_DIR/test/IO/pydefix/env/bin/activate python3 -m pip install -r $IDEFIX_DIR/test/IO/pydefix/python_requirements.txt - scripts/ci/run-tests $IDEFIX_DIR/test/IO/pydefix -all $TESTME_OPTIONS + ./test.py -subdir $IDEFIX_DIR/test/IO/pydefix $TESTME_OPTIONS - name: xdmf - run: scripts/ci/run-tests $IDEFIX_DIR/test/IO/xdmf -all $TESTME_OPTIONS + run: ./test.py -subdir $IDEFIX_DIR/test/IO/xdmf $TESTME_OPTIONS From 9869e0f6e96e98e688b51439e583e17c92f99718 Mon Sep 17 00:00:00 2001 From: Sebastien Valat Date: Mon, 27 Apr 2026 14:42:35 +0200 Subject: [PATCH 2/3] ci: fix keeping usage of the wrapper script run-tests to load the intel env --- .github/workflows/idefix-ci-jobs.yml | 90 ++++++++++++++-------------- scripts/ci/run-tests | 3 +- 2 files changed, 46 insertions(+), 47 deletions(-) diff --git a/.github/workflows/idefix-ci-jobs.yml b/.github/workflows/idefix-ci-jobs.yml index 903bc88c..413cff89 100644 --- a/.github/workflows/idefix-ci-jobs.yml +++ b/.github/workflows/idefix-ci-jobs.yml @@ -33,13 +33,13 @@ jobs: submodules: recursive persist-credentials: false - name: Sod test - run: ./test.py -subdir $IDEFIX_DIR/test/HD/sod $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/sod $TESTME_OPTIONS - name: Isothermal Sod test - run: ./test.py -subdir $IDEFIX_DIR/test/HD/sod-iso $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/sod-iso $TESTME_OPTIONS - name: Mach reflection test - run: ./test.py -subdir $IDEFIX_DIR/test/HD/MachReflection $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/MachReflection $TESTME_OPTIONS - name: Sedov blast wave - run: ./test.py -subdir $IDEFIX_DIR/test/HD/SedovBlastWave $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/SedovBlastWave $TESTME_OPTIONS ParabolicHydro: runs-on: self-hosted @@ -50,11 +50,11 @@ jobs: submodules: recursive persist-credentials: false - name: Viscous flow past cylinder - run: ./test.py -subdir $IDEFIX_DIR/test/HD/ViscousFlowPastCylinder $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/ViscousFlowPastCylinder $TESTME_OPTIONS - name: Viscous disk - run: ./test.py -subdir $IDEFIX_DIR/test/HD/ViscousDisk $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/ViscousDisk $TESTME_OPTIONS - name: Thermal diffusion - run: ./test.py -subdir $IDEFIX_DIR/test/HD/thermalDiffusion $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/thermalDiffusion $TESTME_OPTIONS ShocksMHD: runs-on: self-hosted @@ -65,17 +65,17 @@ jobs: submodules: recursive persist-credentials: false - name: MHD Sod test - run: ./test.py -subdir $IDEFIX_DIR/test/MHD/sod $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sod $TESTME_OPTIONS - name: MHD Isothermal Sod test - run: ./test.py -subdir $IDEFIX_DIR/test/MHD/sod-iso $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sod-iso $TESTME_OPTIONS - name: Orszag Tang - run: ./test.py -subdir $IDEFIX_DIR/test/MHD/OrszagTang $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/OrszagTang $TESTME_OPTIONS - name: Orszag Tang 3D - run: ./test.py -subdir $IDEFIX_DIR/test/MHD/OrszagTang3D $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/OrszagTang3D $TESTME_OPTIONS - name: Linear wave test - run: ./test.py -subdir $IDEFIX_DIR/test/MHD/LinearWaveTest $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/LinearWaveTest $TESTME_OPTIONS - name: Axis Flux tube - run: ./test.py -subdir $IDEFIX_DIR/test/MHD/AxisFluxTube $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/AxisFluxTube $TESTME_OPTIONS ParabolicMHD: runs-on: self-hosted @@ -86,15 +86,15 @@ jobs: submodules: recursive persist-credentials: false - name: Ambipolar C Shock - run: ./test.py -subdir $IDEFIX_DIR/test/MHD/AmbipolarCshock $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/AmbipolarCshock $TESTME_OPTIONS - name: Ambipolar C Shock 3D - run: ./test.py -subdir $IDEFIX_DIR/test/MHD/AmbipolarCshock3D $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/AmbipolarCshock3D $TESTME_OPTIONS - name: Resistive Alfvén wave - run: ./test.py -subdir $IDEFIX_DIR/test/MHD/ResistiveAlfvenWave $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/ResistiveAlfvenWave $TESTME_OPTIONS - name: Grid coarsening diffusion - run: ./test.py -subdir $IDEFIX_DIR/test/MHD/Coarsening $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/Coarsening $TESTME_OPTIONS - name: Hall whistler waves - run: ./test.py -subdir $IDEFIX_DIR/test/MHD/HallWhistler $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/HallWhistler $TESTME_OPTIONS Fargo: needs: [ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD] @@ -106,9 +106,9 @@ jobs: submodules: recursive persist-credentials: false - name: Fargo + planet - run: ./test.py -subdir $IDEFIX_DIR/test/HD/FargoPlanet $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/FargoPlanet $TESTME_OPTIONS - name: Fargo MHD spherical - run: ./test.py -subdir $IDEFIX_DIR/test/MHD/FargoMHDSpherical $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/FargoMHDSpherical $TESTME_OPTIONS ShearingBox: needs: [ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD] @@ -120,9 +120,9 @@ jobs: submodules: recursive persist-credentials: false - name: Hydro shearing box - run: ./test.py -subdir $IDEFIX_DIR/test/HD/ShearingBox $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/ShearingBox $TESTME_OPTIONS - name: MHD shearing box - run: ./test.py -subdir $IDEFIX_DIR/test/MHD/ShearingBox $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/ShearingBox $TESTME_OPTIONS SelfGravity: needs: [ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD] @@ -134,15 +134,15 @@ jobs: submodules: recursive persist-credentials: false - name: Jeans Instability - run: ./test.py -subdir $IDEFIX_DIR/test/SelfGravity/JeansInstability $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/JeansInstability $TESTME_OPTIONS - name: Random sphere spherical - run: ./test.py -subdir $IDEFIX_DIR/test/SelfGravity/RandomSphere $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/RandomSphere $TESTME_OPTIONS - name: Random sphere cartesian - run: ./test.py -subdir $IDEFIX_DIR/test/SelfGravity/RandomSphereCartesian $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/RandomSphereCartesian $TESTME_OPTIONS - name: Uniform spherical collapse - run: ./test.py -subdir $IDEFIX_DIR/test/SelfGravity/UniformCollapse $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/UniformCollapse $TESTME_OPTIONS - name: Dusty spherical collapse - run: ./test.py -subdir $IDEFIX_DIR/test/SelfGravity/DustyCollapse $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/DustyCollapse $TESTME_OPTIONS Planet: needs: [ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD] @@ -154,17 +154,17 @@ jobs: submodules: recursive persist-credentials: false - name: 3 body - run: ./test.py -subdir $IDEFIX_DIR/test/Planet/Planet3Body $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/Planet3Body $TESTME_OPTIONS - name: migration - run: ./test.py -subdir $IDEFIX_DIR/test/Planet/PlanetMigration2D $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetMigration2D $TESTME_OPTIONS - name: planet-planet - run: ./test.py -subdir $IDEFIX_DIR/test/Planet/PlanetPlanetRK42D $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetPlanetRK42D $TESTME_OPTIONS - name: spiral wake - run: ./test.py -subdir $IDEFIX_DIR/test/Planet/PlanetSpiral2D $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetSpiral2D $TESTME_OPTIONS - name: torques - run: ./test.py -subdir $IDEFIX_DIR/test/Planet/PlanetTorque3D $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetTorque3D $TESTME_OPTIONS - name: RK5 - run: ./test.py -subdir $IDEFIX_DIR/test/Planet/PlanetsIsActiveRK52D $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetsIsActiveRK52D $TESTME_OPTIONS Dust: needs: [ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD] @@ -176,9 +176,9 @@ jobs: submodules: recursive persist-credentials: false - name: Energy conservation - run: ./test.py -subdir $IDEFIX_DIR/test/Dust/DustEnergy $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/Dust/DustEnergy $TESTME_OPTIONS - name: Dusty wave - run: ./test.py -subdir $IDEFIX_DIR/test/Dust/DustyWave $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/Dust/DustyWave $TESTME_OPTIONS Braginskii: needs: [ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD] @@ -190,13 +190,13 @@ jobs: submodules: recursive persist-credentials: false - name: MTI - run: ./test.py -subdir $IDEFIX_DIR/test/MHD/MTI $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/MTI $TESTME_OPTIONS - name: Spherical anisotropic diffusion - run: ./test.py -subdir $IDEFIX_DIR/test/MHD/sphBragTDiffusion $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sphBragTDiffusion $TESTME_OPTIONS - name: Spherical anisotropic viscosity - run: ./test.py -subdir $IDEFIX_DIR/test/MHD/sphBragViscosity $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sphBragViscosity $TESTME_OPTIONS - name: Collisionless thermal conduction - run: ./test.py -subdir $IDEFIX_DIR/test/MHD/clessTDiffusion $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/clessTDiffusion $TESTME_OPTIONS Examples: needs: [Fargo, Dust, Planet, ShearingBox, SelfGravity] @@ -220,11 +220,11 @@ jobs: submodules: recursive persist-credentials: false - name: Lookup table - run: ./test.py -subdir $IDEFIX_DIR/test/utils/lookupTable $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/utils/lookupTable $TESTME_OPTIONS - name: Dump Image - run: ./test.py -subdir $IDEFIX_DIR/test/utils/dumpImage $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/utils/dumpImage $TESTME_OPTIONS - name: Column density - run: ./test.py -subdir $IDEFIX_DIR/test/utils/columnDensity $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/utils/columnDensity $TESTME_OPTIONS IOs: needs: [Fargo, Dust, Planet, ShearingBox, SelfGravity] @@ -236,13 +236,13 @@ jobs: submodules: recursive persist-credentials: false - name: Restart dumps - run: ./test.py -subdir $IDEFIX_DIR/test/IO/dump $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/IO/dump $TESTME_OPTIONS - name: Pydefix run: | python3 -m venv $IDEFIX_DIR/test/IO/pydefix/env source $IDEFIX_DIR/test/IO/pydefix/env/bin/activate python3 -m pip install -r $IDEFIX_DIR/test/IO/pydefix/python_requirements.txt - ./test.py -subdir $IDEFIX_DIR/test/IO/pydefix $TESTME_OPTIONS + scripts/ci/run-tests $IDEFIX_DIR/test/IO/pydefix $TESTME_OPTIONS - name: xdmf - run: ./test.py -subdir $IDEFIX_DIR/test/IO/xdmf $TESTME_OPTIONS + run: scripts/ci/run-tests $IDEFIX_DIR/test/IO/xdmf $TESTME_OPTIONS diff --git a/scripts/ci/run-tests b/scripts/ci/run-tests index 32983102..dc6023b1 100755 --- a/scripts/ci/run-tests +++ b/scripts/ci/run-tests @@ -3,5 +3,4 @@ if [ "$IDEFIX_COMPILER" == icc ]; then source /opt/intel/oneapi/setvars.sh fi set -ue -cd "$1" -./testme.py "${@:2}" +./test.py -subdir "${@}" From 2c116ed672c2b067b7ac4f0ace1504290bdb7710 Mon Sep 17 00:00:00 2001 From: Sebastien Valat Date: Wed, 29 Apr 2026 11:32:29 +0200 Subject: [PATCH 3/3] ci: add pytest to the test/IO/pydefix/python_requirements.txt to be able to use ./test.py --- test/IO/pydefix/python_requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test/IO/pydefix/python_requirements.txt b/test/IO/pydefix/python_requirements.txt index 9489d088..230bc708 100644 --- a/test/IO/pydefix/python_requirements.txt +++ b/test/IO/pydefix/python_requirements.txt @@ -5,3 +5,4 @@ numpy>=1.16.6 matplotlib>=2.2.5 pybind11>=2.10.0 +pytest>=8.4.2