Add support for using env variable

EXTRA_CONFIGURE_ARGS can now be used to pass extra flags to our build scripts. Also had to remove FORCE from Trilinos_ENABLE_TESTS flag so that we are able to override it.
trilinos · Nov 20, 2024 · c1c56bb · c1c56bb
1 parent b3df351
commit c1c56bb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini
@@ -1557,7 +1557,7 @@ use SEMS_COMMON_CUDA_11
 
 use CUDA11-RUN-SERIAL-TESTS
 
-opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL FORCE : OFF
+opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL : OFF
 
 [rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_all]
 use rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_no-package-enables

diff --git a/packages/framework/pr_tools/LaunchDriver.py b/packages/framework/pr_tools/LaunchDriver.py
@@ -118,6 +118,8 @@ def main(argv):
 
   if args.extra_configure_args:
      cmd += f" --extra-configure-args=\"{args.extra_configure_args}\""
+  elif os.getenv("EXTRA_CONFIGURE_ARGS"):
+     cmd += f" --extra-configure-args=\"{os.getenv('EXTRA_CONFIGURE_ARGS')}\""
 
   print("LaunchDriver> EXEC: " + cmd, flush=True)
 

diff --git a/packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationBase.py b/packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationBase.py
@@ -790,7 +790,8 @@ def prepare_test(self):
             "F77",
             "F90",
             "FC",
-            "MODULESHOME"
+            "MODULESHOME",
+            "EXTRA_CONFIGURE_ARGS"
             ]
         self.message("")
         tr_env.set_environment.pretty_print_envvars(envvar_filter=envvars_to_print)

diff --git a/packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationStandard.py b/packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationStandard.py
@@ -18,6 +18,9 @@ class TrilinosPRConfigurationStandard(TrilinosPRConfigurationBase):
     """
     def __init__(self, args):
         super(TrilinosPRConfigurationStandard, self).__init__(args)
+        if "extra_configure_args" in args:
+            d = vars(args)
+            self._arg_extra_configure_args = d["extra_configure_args"]
 
 
     def execute_test(self):