fix: path to script for test run in docker container

norlab-ulaval · Dec 11, 2023 · 2111244 · 2111244
1 parent ca67c54
commit 2111244
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 74 deletions.
diff --git a/...jetbrains_run_config/lpm_execute_compose.bash › lpm_execute_compose.bash -- build.run.xml b/...jetbrains_run_config/lpm_execute_compose.bash › lpm_execute_compose.bash -- build.run.xml
diff --git a/...un_config/lpm_execute_compose.bash › lpm_execute_compose.bash › test flag (popup).run.xml b/...un_config/lpm_execute_compose.bash › lpm_execute_compose.bash › test flag (popup).run.xml
diff --git a/...tbrains_run_config/lpm_execute_compose_over_build_matrix.bash › test flag (popup).run.xml b/...tbrains_run_config/lpm_execute_compose_over_build_matrix.bash › test flag (popup).run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="nbs_execute_compose_over_build_matrix.bash › test flag (popup)" type="ShConfigurationType" folderName="(B | TEST › IamBuildSystemTester) LPM test user script in isolation" editBeforeRun="true">
-    <option name="SCRIPT_TEXT" value="bash build_and_run_IamBuildSystemTester.bash &quot;bash ./nbs_execute_compose_over_build_matrix.bash --repository-version-build-matrix-override latest  --cmake-build-type-build-matrix-override None --docker-debug-logs -- build --dry-run&quot;" />
+  <configuration default="false" name="lpm_crawl_dependencies_build_matrix.bash › test flag (popup)" type="ShConfigurationType" folderName="(B | TEST › IamBuildSystemTester) LPM test user script in isolation" editBeforeRun="true">
+    <option name="SCRIPT_TEXT" value="bash build_and_run_IamBuildSystemTester.bash &quot;bash ./lpm_crawl_dependencies_build_matrix.bash --repository-version-build-matrix-override latest  --cmake-build-type-build-matrix-override None --docker-debug-logs -- build --dry-run&quot;" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />

diff --git a/...un_config/lpm_execute_compose_over_build_matrix.bash › test flag override (popup).run.xml b/...un_config/lpm_execute_compose_over_build_matrix.bash › test flag override (popup).run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="nbs_execute_compose_over_build_matrix.bash › test flag override (popup)" type="ShConfigurationType" folderName="(B | TEST › IamBuildSystemTester) LPM test user script in isolation" editBeforeRun="true">
-    <option name="SCRIPT_TEXT" value="bash build_and_run_IamBuildSystemTester.bash &quot;bash ./nbs_execute_compose_over_build_matrix.bash --repository-version-build-matrix-override PR1 --cmake-build-type-build-matrix-override RelWithDebInfo --os-name-build-matrix-override osx --osx-version-build-matrix-override ventura --ubuntu-version-build-matrix-override jammy -- build --dry-run dependencies&quot;" />
+  <configuration default="false" name="lpm_crawl_libpointmatcher_build_matrix.bash › test flag override (popup)" type="ShConfigurationType" folderName="(B | TEST › IamBuildSystemTester) LPM test user script in isolation" editBeforeRun="true">
+    <option name="SCRIPT_TEXT" value="bash build_and_run_IamBuildSystemTester.bash &quot;bash ./lpm_crawl_libpointmatcher_build_matrix.bash --repository-version-build-matrix-override PR1 --cmake-build-type-build-matrix-override RelWithDebInfo --os-name-build-matrix-override osx --osx-version-build-matrix-override ventura --ubuntu-version-build-matrix-override jammy -- build --dry-run dependencies&quot;" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />

diff --git a/build_system/.jetbrains_run_config/test_execute_compose_with_flag.bash.run.xml b/build_system/.jetbrains_run_config/test_execute_compose_with_flag.bash.run.xml
diff --git a/build_system/tests/build_and_run_IamBuildSystemTester.bash b/build_system/tests/build_and_run_IamBuildSystemTester.bash
@@ -27,9 +27,12 @@ fi
 _PATH_TO_SCRIPT="$(realpath "${BASH_SOURCE[0]}")"
 LPM_ROOT_DIR="$(dirname "${_PATH_TO_SCRIPT}")/.."
 
+set -o allexport && source .env && set +o allexport
+#tree -L 1 $LPM_ROOT_DIR
+
 # ....Helper function..............................................................................................
 # import shell functions from utilities library
-source "${LPM_ROOT_DIR}/utilities/norlab-shell-script-tools/import_norlab_shell_script_tools_lib.bash"
+source "${LPM_ROOT_DIR}/build_system/utilities/norlab-shell-script-tools/import_norlab_shell_script_tools_lib.bash"
 
 #source ./function_library/prompt_utilities.bash
 #source ./function_library/general_utilities.bash

diff --git a/build_system/tests/test_in_docker_container/test_execute_compose_over_build_matrix.bash b/build_system/tests/test_in_docker_container/test_execute_compose_over_build_matrix.bash
@@ -8,7 +8,7 @@ LPM_ROOT_DIR="$(dirname "${_PATH_TO_SCRIPT}")"
 cd "${LPM_ROOT_DIR}/../"
 
 # ====begin========================================================================================
-bash build_and_run_IamBuildSystemTester.bash "bash ./nbs_execute_compose_over_build_matrix.bash \
+bash build_and_run_IamBuildSystemTester.bash "bash ./lpm_crawl_libpointmatcher_build_matrix.bash \
     --repository-version-build-matrix-override latest  \
     --cmake-build-type-build-matrix-override None \
     --docker-debug-logs \

diff --git a/...stem/tests/test_in_docker_container/test_execute_compose_over_build_matrix_with_flag.bash b/...stem/tests/test_in_docker_container/test_execute_compose_over_build_matrix_with_flag.bash
@@ -8,7 +8,7 @@ LPM_ROOT_DIR="$(dirname "${_PATH_TO_SCRIPT}")"
 cd "${LPM_ROOT_DIR}/../"
 
 # ====begin========================================================================================
-bash build_and_run_IamBuildSystemTester.bash "bash ./nbs_execute_compose_over_build_matrix.bash \
+bash build_and_run_IamBuildSystemTester.bash "bash ./lpm_crawl_libpointmatcher_build_matrix.bash \
     --repository-version-build-matrix-override PR1 \
     --cmake-build-type-build-matrix-override RelWithDebInfo \
     --os-name-build-matrix-override osx \

diff --git a/build_system/tests/test_in_docker_container/test_execute_compose_with_flag.bash b/build_system/tests/test_in_docker_container/test_execute_compose_with_flag.bash