diff --git a/programs/ssl/CMakeLists.txt b/programs/ssl/CMakeLists.txt index e8d2865d9e..066940e91b 100644 --- a/programs/ssl/CMakeLists.txt +++ b/programs/ssl/CMakeLists.txt @@ -19,10 +19,10 @@ set(executables ) if(DEV_MODE) - # Inform CMake the the following file will be generated as part of the build + # Inform CMake that the following file will be generated as part of the build # process, so it doesn't complain that it doesn't exist yet. Starting from # CMake 3.20, this will no longer be necessary as CMake will automatically - # propagate this information accross the tree, for now it's only visible + # propagate this information across the tree, for now it's only visible # inside the same directory, so we need to propagate manually. set_source_files_properties( ${CMAKE_CURRENT_BINARY_DIR}/../test/query_config.c diff --git a/programs/test/CMakeLists.txt b/programs/test/CMakeLists.txt index 053b03c952..94331b8c7b 100644 --- a/programs/test/CMakeLists.txt +++ b/programs/test/CMakeLists.txt @@ -44,7 +44,7 @@ if(DEV_MODE) ${CMAKE_CURRENT_SOURCE_DIR}/../../include/mbedtls/mbedtls_config.h ${CMAKE_CURRENT_SOURCE_DIR}/../../scripts/data_files/query_config.fmt ) - # this file will also be used in anoter directory, so create a target, see + # this file will also be used in another directory, so create a target, see # https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#how-can-i-add-a-dependency-to-a-source-file-which-is-generated-in-a-subdirectory add_custom_target(generate_query_config_c DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/query_config.c) diff --git a/scripts/generate_query_config.pl b/scripts/generate_query_config.pl index eab986afad..b565024719 100755 --- a/scripts/generate_query_config.pl +++ b/scripts/generate_query_config.pl @@ -50,7 +50,7 @@ if( @ARGV ) { unless( -f $config_file && -f $query_config_format_file ) { chdir '..' or die; -f $config_file && -f $query_config_format_file - or die "Without arguments, must be run from root or a subdirectory\n"; + or die "No arguments supplied, must be run from project root or a first-level subdirectory\n"; } } diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index d3fba17877..f0e9a7d6c0 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -1004,10 +1004,10 @@ component_test_ref_configs () { # However this doesn't work as the generation script expects a specific # format for mbedtls_config.h, which the other files don't follow. Also, # cmake can't know this, but re-generation is actually not necessary as - # the generated files only depend on the list of availabe options, not + # the generated files only depend on the list of available options, not # whether they're on or off. So, disable cmake's (over-sensitive here) # dependency resolution for generated files and just rely on them being - # present (thanks for pre_generate_files) by turning DEV_MODE off. + # present (thanks to pre_generate_files) by turning DEV_MODE off. CC=gcc cmake -D DEV_MODE=Off -D CMAKE_BUILD_TYPE:String=Asan . tests/scripts/test-ref-configs.pl }