From 1d50f358ed8c595ca95b5abecb79cc44eb93b26d Mon Sep 17 00:00:00 2001 From: Victor Machado Date: Thu, 19 Dec 2024 15:01:23 +0100 Subject: [PATCH] Fixing test EasyConfigs to match test framework requirements --- .../easyconfigs/test_ecs/r/R/R-4.3.3-gfbf-2023b.eb | 7 +++---- .../test_ecs/r/R/R-4.3.3-gfbf-2023b_reduced_1_ext.eb | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/test/framework/easyconfigs/test_ecs/r/R/R-4.3.3-gfbf-2023b.eb b/test/framework/easyconfigs/test_ecs/r/R/R-4.3.3-gfbf-2023b.eb index 5209a5ce4a..91a55dafdf 100644 --- a/test/framework/easyconfigs/test_ecs/r/R/R-4.3.3-gfbf-2023b.eb +++ b/test/framework/easyconfigs/test_ecs/r/R/R-4.3.3-gfbf-2023b.eb @@ -1,6 +1,9 @@ name = 'R' version = '4.3.3' +# should be "EB_R", but OK for testing purposes +easyblock = 'EB_toy' + homepage = 'https://www.r-project.org/' description = """R is a free software environment for statistical computing and graphics.""" @@ -52,10 +55,6 @@ configopts = "--with-pic --enable-threads --enable-R-shlib" # we're installing them anyway below configopts += " --with-recommended-packages=no" -# specify that at least EasyBuild v3.5.0 is required, -# since we rely on the updated easyblock for R to configure correctly w.r.t. BLAS/LAPACK -easybuild_version = '3.5.0' - exts_default_options = { 'source_urls': [ 'https://cran.r-project.org/src/contrib/Archive/%(name)s', # package archive diff --git a/test/framework/easyconfigs/test_ecs/r/R/R-4.3.3-gfbf-2023b_reduced_1_ext.eb b/test/framework/easyconfigs/test_ecs/r/R/R-4.3.3-gfbf-2023b_reduced_1_ext.eb index cd3ebef490..da27524468 100644 --- a/test/framework/easyconfigs/test_ecs/r/R/R-4.3.3-gfbf-2023b_reduced_1_ext.eb +++ b/test/framework/easyconfigs/test_ecs/r/R/R-4.3.3-gfbf-2023b_reduced_1_ext.eb @@ -1,6 +1,9 @@ name = 'R' version = '4.3.3' +# should be "EB_R", but OK for testing purposes +easyblock = 'EB_toy' + homepage = 'https://www.r-project.org/' description = """R is a free software environment for statistical computing and graphics.""" @@ -52,10 +55,6 @@ configopts = "--with-pic --enable-threads --enable-R-shlib" # we're installing them anyway below configopts += " --with-recommended-packages=no" -# specify that at least EasyBuild v3.5.0 is required, -# since we rely on the updated easyblock for R to configure correctly w.r.t. BLAS/LAPACK -easybuild_version = '3.5.0' - exts_default_options = { 'source_urls': [ 'https://cran.r-project.org/src/contrib/Archive/%(name)s', # package archive