Fix for #60, at() syntax error

OpenCyphal · Oct 13, 2023 · 56f11a6 · 56f11a6
1 parent d2f0af3
commit 56f11a6
Show file tree

Hide file tree

Showing 6 changed files with 202 additions and 122 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -40,44 +40,49 @@
         "sonar.cfamily.reportingCppStandardOverride": "c++14"
     },
     "cSpell.words": [
+        "arity",
+        "AUTOSAR",
+        "builddir",
         "cetl",
-        "DCETL_",
-        "cetlvast",
-        "DCETLVAST_",
-        "DCYPHAL",
-        "cyphal",
-        "opencyphal",
         "cetlpf",
-        "AUTOSAR",
-        "tparam",
-        "unsynchronized",
+        "cetlvast",
+        "COMPILETEST_PRECHECK",
         "copydoc",
-        "trimleft",
-        "Pavel",
-        "Kirienko",
-        "gtest",
-        "gmock",
-        "DSDL",
-        "rend",
-        "rbegin",
-        "builddir",
-        "sonarqube",
-        "sonarcloud",
-        "doxygen",
-        "googletest",
-        "googlemock",
-        "DCMAKE_",
         "ctest",
+        "cyphal",
+        "DCETL_",
+        "DCETLVAST_",
+        "DCMAKE_",
         "DCTEST_",
-        "pushd",
-        "popd",
-        "gcovr",
+        "DCYPHAL",
         "devcontainer",
         "DFETCHCONTENT_FULLY_DISCONNECTED",
-        "COMPILETEST_PRECHECK",
-        "arity",
+        "doxygen",
+        "DSDL",
+        "endforeach",
+        "endfunction",
+        "gcovr",
+        "gmock",
+        "googlemock",
+        "googletest",
+        "gtest",
+        "insertable",
+        "Kirienko",
         "mainpage",
-        "subpage"
+        "NOTFOUND",
+        "opencyphal",
+        "Pavel",
+        "popd",
+        "pushd",
+        "rbegin",
+        "rend",
+        "sonarcloud",
+        "sonarqube",
+        "STREQUAL",
+        "subpage",
+        "tparam",
+        "trimleft",
+        "unsynchronized"
     ],
     "files.associations": {
         "memory_resource": "cpp",
@@ -180,7 +185,9 @@
         "typeindex": "cpp",
         "charconv": "cpp",
         "csignal": "cpp",
-        "format": "cpp"
+        "format": "cpp",
+        "execution": "cpp",
+        "filesystem": "cpp"
     },
     "git-blame.gitWebUrl": ""
 }
diff --git a/cetlvast/cmake/modules/Findgcovr.cmake b/cetlvast/cmake/modules/Findgcovr.cmake
@@ -3,6 +3,7 @@
 # Copyright Amazon.com Inc. or its affiliates.
 # SPDX-License-Identifier: MIT
 #
+# cSpell: words fprofile fcoverage gcov tracefile objdir gcno gcda objlib tracefiles
 
 find_program(GCOVR gcovr)
 
@@ -22,7 +23,7 @@ define_property(DIRECTORY
 )
 
 # function: enable_instrumentation
-# Sets well-known compiler flags for gcc and/or clang to insert intrumentations
+# Sets well-known compiler flags for gcc and/or clang to insert instrumentations
 # into binaries that generate coverage data.
 #
 # param: TARGET target - The target to set compile and link options on.
@@ -199,12 +200,12 @@ endfunction(define_gcovr_tracefile_target)
 #
 # param: COVERAGE_REPORT_FORMATS - Supports html or sonarqube
 # param: ROOT_DIRECTORY string - The root directory of the source to be covered.
-# param: OUT_REPORT_INDICIES list[string] - The name of a variable to set to a list of index files of the reports.
+# param: OUT_REPORT_INDICES list[string] - The name of a variable to set to a list of index files of the reports.
 #
 function (enable_coverage_report)
     #+-[input]----------------------------------------------------------------+
     set(options "")
-    set(singleValueArgs OUT_REPORT_INDICIES ROOT_DIRECTORY)
+    set(singleValueArgs OUT_REPORT_INDICES ROOT_DIRECTORY)
     set(multiValueArgs COVERAGE_REPORT_FORMATS)
     cmake_parse_arguments(PARSE_ARGV 0 ARG "${options}" "${singleValueArgs}" "${multiValueArgs}")
 
@@ -241,7 +242,7 @@ function (enable_coverage_report)
         else()
             message(FATAL_ERROR "${LOCAL_REPORT_FORMAT} is not a supported coverage report format.")
         endif()
-        list(APPEND LOCAL_REPORT_INDICIES ${LOCAL_REPORT_INDEX})
+        list(APPEND LOCAL_REPORT_INDICES ${LOCAL_REPORT_INDEX})
 
         add_custom_command(
             OUTPUT ${LOCAL_REPORT_INDEX}
@@ -263,8 +264,8 @@ function (enable_coverage_report)
 
     #+-[output]---------------------------------------------------------------+
 
-    if (NOT ARG_OUT_REPORT_INDICIES STREQUAL "")
-        set(${ARG_OUT_REPORT_INDICIES} "${LOCAL_REPORT_INDICIES}" PARENT_SCOPE)
+    if (NOT ARG_OUT_REPORT_INDICES STREQUAL "")
+        set(${ARG_OUT_REPORT_INDICES} "${LOCAL_REPORT_INDICES}" PARENT_SCOPE)
     endif()
 
 endfunction(enable_coverage_report)
diff --git a/cetlvast/suites/unittest/CMakeLists.txt b/cetlvast/suites/unittest/CMakeLists.txt
@@ -89,7 +89,7 @@ set_directory_properties(PROPERTIES
 if (CMAKE_BUILD_TYPE STREQUAL "Coverage")
     enable_coverage_report(COVERAGE_REPORT_FORMATS html sonarqube
                            ROOT_DIRECTORY ${CETL_ROOT}
-                           OUT_REPORT_INDICIES LOCAL_COVERAGE_REPORT_INDICIES
+                           OUT_REPORT_INDICES LOCAL_COVERAGE_REPORT_INDICIES
     )
 endif()