From 6575b12636450ca780b1f97802fc6eaa35d550d4 Mon Sep 17 00:00:00 2001 From: Evan Harvey Date: Wed, 15 Jun 2022 10:19:28 -0600 Subject: [PATCH] packages/framework: Try to override dynamic package enables --- packages/framework/pr_tools/pullrequest-specs.ini | 2 +- .../trilinosprhelpers/unittests/pullrequest-specs.ini | 2 +- .../unittests/test_TrilinosPRConfigurationBase.py | 4 ++-- .../unittests/test_TrilinosPRConfigurationStandard.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/framework/pr_tools/pullrequest-specs.ini b/packages/framework/pr_tools/pullrequest-specs.ini index 024c0b722bbc..19237a0c2da6 100644 --- a/packages/framework/pr_tools/pullrequest-specs.ini +++ b/packages/framework/pr_tools/pullrequest-specs.ini @@ -11,7 +11,7 @@ # - `package_subproject_list.cmake` and # # Instead of using the TriBiTS tool to determine changes. -python-3: TrilinosFrameworkTests +Trilinos_PR_python3: TrilinosFrameworkTests Trilinos-pullrequest-gcc-8.3.0-installation-testing A: Teuchos Trilinos-pullrequest-gcc-8.3.0-installation-testing B: Tpetra # diff --git a/packages/framework/pr_tools/trilinosprhelpers/unittests/pullrequest-specs.ini b/packages/framework/pr_tools/trilinosprhelpers/unittests/pullrequest-specs.ini index 024c0b722bbc..19237a0c2da6 100644 --- a/packages/framework/pr_tools/trilinosprhelpers/unittests/pullrequest-specs.ini +++ b/packages/framework/pr_tools/trilinosprhelpers/unittests/pullrequest-specs.ini @@ -11,7 +11,7 @@ # - `package_subproject_list.cmake` and # # Instead of using the TriBiTS tool to determine changes. -python-3: TrilinosFrameworkTests +Trilinos_PR_python3: TrilinosFrameworkTests Trilinos-pullrequest-gcc-8.3.0-installation-testing A: Teuchos Trilinos-pullrequest-gcc-8.3.0-installation-testing B: Tpetra # diff --git a/packages/framework/pr_tools/trilinosprhelpers/unittests/test_TrilinosPRConfigurationBase.py b/packages/framework/pr_tools/trilinosprhelpers/unittests/test_TrilinosPRConfigurationBase.py index 1ae70226b311..d48e9116cc4c 100755 --- a/packages/framework/pr_tools/trilinosprhelpers/unittests/test_TrilinosPRConfigurationBase.py +++ b/packages/framework/pr_tools/trilinosprhelpers/unittests/test_TrilinosPRConfigurationBase.py @@ -250,8 +250,8 @@ def dummy_args_python3(self): Generate dummy command line arguments """ args = copy.deepcopy(self.dummy_args()) - args.pullrequest_build_name = "python-3" - args.genconfig_build_name = "python-3" + args.pullrequest_build_name = "Trilinos_PR_python3" + args.genconfig_build_name = "Trilinos_PR_python3" return args diff --git a/packages/framework/pr_tools/trilinosprhelpers/unittests/test_TrilinosPRConfigurationStandard.py b/packages/framework/pr_tools/trilinosprhelpers/unittests/test_TrilinosPRConfigurationStandard.py index e3956de8e205..d30c6fcd3a6b 100755 --- a/packages/framework/pr_tools/trilinosprhelpers/unittests/test_TrilinosPRConfigurationStandard.py +++ b/packages/framework/pr_tools/trilinosprhelpers/unittests/test_TrilinosPRConfigurationStandard.py @@ -236,7 +236,7 @@ def test_TrilinosPRConfigurationStandardPython3(self): - Change args to enable dry_run mode. """ args = self.dummy_args() - args.pullrequest_build_name = "python-3" + args.pullrequest_build_name = "Trilinos_PR_python3" pr_config = trilinosprhelpers.TrilinosPRConfigurationStandard(args) # prepare step