diff --git a/scripts/ci/jobs/build-linux-arch.yml b/scripts/ci/jobs/build-linux-arch.yml index 3e3d12e5a5578fb7f3787159b344f495480d6821..867845b33557d0a3f2ca62fd228c822f46528133 100644 --- a/scripts/ci/jobs/build-linux-arch.yml +++ b/scripts/ci/jobs/build-linux-arch.yml @@ -11,4 +11,3 @@ build linux arch: CMAKE_ARGS: >- -DBUILD_SHARED_LIBS=ON -DOGS_USE_MKL=ON - CTEST_ARGS: -L default|Notebook diff --git a/scripts/ci/jobs/build-linux-petsc.yml b/scripts/ci/jobs/build-linux-petsc.yml index e367caa8309bb201933eac19b62def9106a8fa4a..7c0c2d6dbfb7292e8438a491209dd4cce66e6206 100644 --- a/scripts/ci/jobs/build-linux-petsc.yml +++ b/scripts/ci/jobs/build-linux-petsc.yml @@ -13,4 +13,4 @@ build linux petsc: CMAKE_PRESET: release-petsc CMAKE_ARGS: >- -DOGS_USE_PIP=ON - CTEST_ARGS: -L default|Notebook|petsc-mumps + CTEST_ARGS: -L default|petsc-mumps diff --git a/scripts/ci/jobs/build-mac-petsc.yml b/scripts/ci/jobs/build-mac-petsc.yml index 60efc037762147fbd9c610a3f879297bfcf62541..fd0961cc07cc952b95580595320c05421f196fee 100644 --- a/scripts/ci/jobs/build-mac-petsc.yml +++ b/scripts/ci/jobs/build-mac-petsc.yml @@ -13,7 +13,6 @@ build mac petsc arm64: CMAKE_PRESET: release-petsc CMAKE_ARGS: >- -DOGS_USE_PIP=ON - CTEST_ARGS: -L default|Notebook build mac petsc amd64: tags: diff --git a/scripts/cmake/test/NotebookTest.cmake b/scripts/cmake/test/NotebookTest.cmake index f5ea8c6af15c2ad9c2d2e6ea7398d984d9188793..f235f11c05c8d7fc7a00162ea66f6f0e033f47a3 100644 --- a/scripts/cmake/test/NotebookTest.cmake +++ b/scripts/cmake/test/NotebookTest.cmake @@ -42,7 +42,9 @@ function(NotebookTest) return() endif() endif() - if(${NotebookTest_RUNTIME} GREATER ${ogs.ctest.large_runtime}) + # Notebooks are allowed to run longer than usual benchmarks + math(EXPR _notebook_large_runtime "10 * ${ogs.ctest.large_runtime}") + if(${NotebookTest_RUNTIME} GREATER ${_notebook_large_runtime}) string(APPEND NotebookTest_NAME_WE "-LARGE") endif()