From 9ada38bba8d47a78027e83b55300fe44b5b2f83d Mon Sep 17 00:00:00 2001 From: Abrar Rahman Protyasha Date: Fri, 18 Feb 2022 04:49:46 -0500 Subject: [PATCH 1/2] [`abi_check`] Pass quoted `cflags` to colcon The `colcon` invocation in `abi_process_workspace` was only providing the first of the two `cflags`, hence omitting `-Og`. To work around this, the flags must be enclosed by literal quotation marks. This commit escapes the flag specification to insert these literal quotes around the flags. Signed-off-by: Abrar Rahman Protyasha --- industrial_ci/src/tests/abi_check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/industrial_ci/src/tests/abi_check.sh b/industrial_ci/src/tests/abi_check.sh index 16da61594..9f8a35503 100644 --- a/industrial_ci/src/tests/abi_check.sh +++ b/industrial_ci/src/tests/abi_check.sh @@ -81,7 +81,7 @@ function abi_process_workspace() { local version=${1:-$tag} local cflags="-g -Og" - local cmake_args=(--cmake-args "-DCMAKE_C_FLAGS=$cflags" "-DCMAKE_CXX_FLAGS=$cflags") + local cmake_args=(--cmake-args "-DCMAKE_C_FLAGS=\"$cflags\"" "-DCMAKE_CXX_FLAGS=\"$cflags\"") ici_step "install_${tag}_dependencies" ici_install_dependencies "$extend" "$ROSDEP_SKIP_KEYS" "$workspace/src" ici_step "abi_build_${tag}" builder_run_build "$extend" "$workspace" "${cmake_args[@]}" From 6cd3837edf8cf5a223be6af025bb07bcfcb52edb Mon Sep 17 00:00:00 2001 From: Abrar Rahman Protyasha Date: Mon, 16 May 2022 04:29:02 -0400 Subject: [PATCH 2/2] Replace escaped double-quote with single-quote Signed-off-by: Abrar Rahman Protyasha --- industrial_ci/src/tests/abi_check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/industrial_ci/src/tests/abi_check.sh b/industrial_ci/src/tests/abi_check.sh index 9f8a35503..1f7a7deb4 100644 --- a/industrial_ci/src/tests/abi_check.sh +++ b/industrial_ci/src/tests/abi_check.sh @@ -81,7 +81,7 @@ function abi_process_workspace() { local version=${1:-$tag} local cflags="-g -Og" - local cmake_args=(--cmake-args "-DCMAKE_C_FLAGS=\"$cflags\"" "-DCMAKE_CXX_FLAGS=\"$cflags\"") + local cmake_args=(--cmake-args "-DCMAKE_C_FLAGS='$cflags'" "-DCMAKE_CXX_FLAGS='$cflags'") ici_step "install_${tag}_dependencies" ici_install_dependencies "$extend" "$ROSDEP_SKIP_KEYS" "$workspace/src" ici_step "abi_build_${tag}" builder_run_build "$extend" "$workspace" "${cmake_args[@]}"