From 585f68735632cf6365d2e6db971e2288438af6b9 Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Tue, 15 Oct 2024 10:30:18 -0600 Subject: [PATCH 1/4] Remove extra quotes Was causing argument parsing errors (specifically caused issues where the track was wrong for the Kokkos Integration builds). Signed-off-by: Samuel E. Browne --- packages/framework/pr_tools/PullRequestLinuxDriver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/framework/pr_tools/PullRequestLinuxDriver.sh b/packages/framework/pr_tools/PullRequestLinuxDriver.sh index 9ad02d82228b..ab4b1fdf0fc9 100755 --- a/packages/framework/pr_tools/PullRequestLinuxDriver.sh +++ b/packages/framework/pr_tools/PullRequestLinuxDriver.sh @@ -170,7 +170,7 @@ sig_merge_old=$(get_md5sum ${REPO_ROOT:?}/packages/framework/pr_tools/PullReques if [[ ${on_kokkos_develop} == "1" ]]; then message_std "PRDriver> --kokkos-develop is set - setting kokkos and kokkos-kernels packages to current develop and pointing at them" "${SCRIPTPATH}"/SetKokkosDevelop.sh - extra_configure_args="\"-DKokkos_SOURCE_DIR_OVERRIDE:string=kokkos;-DKokkosKernels_SOURCE_DIR_OVERRIDE:string=kokkos-kernels\"${extra_configure_args:+;${extra_configure_args}}" + extra_configure_args="-DKokkos_SOURCE_DIR_OVERRIDE:string=kokkos;-DKokkosKernels_SOURCE_DIR_OVERRIDE:string=kokkos-kernels${extra_configure_args:+;${extra_configure_args}}" else print_banner "Merge Source into Target" message_std "PRDriver> " "TRILINOS_SOURCE_SHA: ${TRILINOS_SOURCE_SHA:?}" From b2a7764bba60b3d19b1ff35f2e2a56593e5f2b77 Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Tue, 15 Oct 2024 10:31:18 -0600 Subject: [PATCH 2/4] Correct ON vs OFF handling Needed parenthesis to pass the full option AND value, instead of switching the option with the value. Signed-off-by: Samuel E. Browne --- .../trilinosprhelpers/TrilinosPRConfigurationStandard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationStandard.py b/packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationStandard.py index 1c44b18a2893..401824ea8b6d 100644 --- a/packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationStandard.py +++ b/packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationStandard.py @@ -77,7 +77,7 @@ def execute_test(self): f"-Dpackage_enables:FILEPATH={self.arg_filename_packageenables}", f"-Dsubprojects_file:FILEPATH={self.arg_filename_subprojects}", f"-DCTEST_DROP_SITE:STRING={self.arg_ctest_drop_site}", - "-DUSE_EXPLICIT_TRILINOS_CACHEFILE:BOOL=" + "ON" if self.arg_use_explicit_cachefile else "OFF", + "-DUSE_EXPLICIT_TRILINOS_CACHEFILE:BOOL=" + ("ON" if self.arg_use_explicit_cachefile else "OFF"), ] if self.arg_extra_configure_args: From 5fbd58a6b65abd904f2d8b21e5d0d7367d0ab032 Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Tue, 15 Oct 2024 10:32:28 -0600 Subject: [PATCH 3/4] Print additional argument Since we print every other arg, may as well print one of the newer ones for debug purposes. Signed-off-by: Samuel E. Browne --- packages/framework/pr_tools/PullRequestLinuxDriverTest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/framework/pr_tools/PullRequestLinuxDriverTest.py b/packages/framework/pr_tools/PullRequestLinuxDriverTest.py index 10a391f1cf18..1c7557e2a50b 100755 --- a/packages/framework/pr_tools/PullRequestLinuxDriverTest.py +++ b/packages/framework/pr_tools/PullRequestLinuxDriverTest.py @@ -292,6 +292,7 @@ def parse_args(): print("| - [O] workspace-dir : {workspace_dir}".format(**vars(arguments))) print("| - [O] extra_configure_args : {extra_configure_args}".format(**vars(arguments))) print("| - [O] dashboard_build_name : {dashboard_build_name}".format(**vars(arguments))) + print("| - [O] use_explicit_cacefile : {use_explicit_cachefile}".format(**vars(arguments))) #print("| - [O] : {}".format(**vars(arguments))) print("+" + "="*78 + "+") From 8a019ae517ef4fe88f0cada7195a2d3d5b1e8e13 Mon Sep 17 00:00:00 2001 From: Samuel Browne Date: Tue, 15 Oct 2024 14:07:19 -0600 Subject: [PATCH 4/4] Fix typo Co-authored-by: Nathan Ellingwood --- packages/framework/pr_tools/PullRequestLinuxDriverTest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/framework/pr_tools/PullRequestLinuxDriverTest.py b/packages/framework/pr_tools/PullRequestLinuxDriverTest.py index 1c7557e2a50b..73caa76a1c62 100755 --- a/packages/framework/pr_tools/PullRequestLinuxDriverTest.py +++ b/packages/framework/pr_tools/PullRequestLinuxDriverTest.py @@ -292,7 +292,7 @@ def parse_args(): print("| - [O] workspace-dir : {workspace_dir}".format(**vars(arguments))) print("| - [O] extra_configure_args : {extra_configure_args}".format(**vars(arguments))) print("| - [O] dashboard_build_name : {dashboard_build_name}".format(**vars(arguments))) - print("| - [O] use_explicit_cacefile : {use_explicit_cachefile}".format(**vars(arguments))) + print("| - [O] use_explicit_cachefile : {use_explicit_cachefile}".format(**vars(arguments))) #print("| - [O] : {}".format(**vars(arguments))) print("+" + "="*78 + "+")