From 22c03d13dcf1c04df7204f9373046901a41094df Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 2 Apr 2023 11:31:08 +0100 Subject: [PATCH 1/3] Added experimental C++14 and C++17 builds to GCC CI --- .github/workflows/gcc.yml | 54 ++++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 95952cee..8ab918e8 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -6,8 +6,50 @@ on: branches: [ master ] jobs: - build-gcc-linux-stl: - name: GCC Linux - STL + build-gcc-cpp14-linux-stl: + name: GCC C++14 Linux - STL + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-22.04] + + steps: + - uses: actions/checkout@v3 + + - name: Build + run: | + git fetch --tags + export ASAN_OPTIONS=alloc_dealloc_mismatch=0,detect_leaks=0 + cmake -DBUILD_TESTS=ON -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF -DETL_CXX_STANDARD=14 ./ + gcc --version + make + + - name: Run tests + run: ./test/etl_tests + + build-gcc-cpp17-linux-stl: + name: GCC C++17 Linux - STL + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-22.04] + + steps: + - uses: actions/checkout@v3 + + - name: Build + run: | + git fetch --tags + export ASAN_OPTIONS=alloc_dealloc_mismatch=0,detect_leaks=0 + cmake -DBUILD_TESTS=ON -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF -DETL_CXX_STANDARD=17 ./ + gcc --version + make + + - name: Run tests + run: ./test/etl_tests + + build-gcc-cpp20-linux-stl: + name: GCC C++20 Linux - STL runs-on: ${{ matrix.os }} strategy: matrix: @@ -27,8 +69,8 @@ jobs: - name: Run tests run: ./test/etl_tests - build-gcc-linux-no-stl: - name: GCC Linux - No STL + build-gcc-cpp20-linux-no-stl: + name: GCC C++20 Linux - No STL runs-on: ${{ matrix.os }} strategy: matrix: @@ -48,8 +90,8 @@ jobs: - name: Run tests run: ./test/etl_tests - build-gcc-linux-stl-force-cpp03: - name: GCC Linux - STL - Force C++03 + build-gcc-cpp20-linux-stl-force-cpp03: + name: GCC C++20 Linux - STL - Force C++03 runs-on: ${{ matrix.os }} strategy: matrix: From 98bfa6a5881a22438451dfbf3f575a2ccaf4511a Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 2 Apr 2023 11:31:57 +0100 Subject: [PATCH 2/3] Deleted script files --- test/runtests-O1.sh | 238 -------------------------------------------- test/runtests-O2.sh | 238 -------------------------------------------- test/runtests-O3.sh | 238 -------------------------------------------- 3 files changed, 714 deletions(-) delete mode 100644 test/runtests-O1.sh delete mode 100644 test/runtests-O2.sh delete mode 100644 test/runtests-O3.sh diff --git a/test/runtests-O1.sh b/test/runtests-O1.sh deleted file mode 100644 index 59bc4062..00000000 --- a/test/runtests-O1.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/sh -clear - -mkdir -p build-make || exit 1 -cd build-make || exit 1 - -echo "ETL Tests" > log.txt - -opt="-O1" - -#****************************************************************************** -# GCC -#****************************************************************************** -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " GCC - STL" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -rm * -rf -gcc --version | grep gcc | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="g++" -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Compilation >>>>" -else - echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " GCC - Initializer list test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../etl_initializer_list/ -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -gcc --version | grep gcc | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="g++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed initializer_list Compilation >>>>" -else - echo "****************\n**** Failed initializer_list ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " Clang - Initializer list test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -rm * -rf -clang --version | grep clang | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="clang++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed initializer_list Compilation >>>>" -else - echo "****************\n**** Failed initializer_list ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " GCC - Error macros 'log_errors' test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../../etl_error_handler/log_errors -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -gcc --version | grep gcc | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="g++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Error macros 'log_errors' Compilation >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors' ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors' ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " GCC - Error macros 'exceptions' test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../../../etl_error_handler/exceptions -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -gcc --version | grep gcc | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="g++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Error macros 'exceptions' Compilation >>>>" -else - echo "****************\n**** Failed Error macros 'exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed Error macros 'exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " GCC - Error macros 'log_errors and exceptions' test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../../../etl_error_handler/log_errors_and_exceptions -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -gcc --version | grep gcc | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="g++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Error macros 'log_errors and exceptions' Compilation >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors and exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors and exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " Clang - Error macros 'log_errors' test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../../../etl_error_handler/log_errors -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -clang --version | grep clang | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="clang++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Error macros 'log_errors' Compilation >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors' ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors' ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " Clang - Error macros 'exceptions' test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../../../etl_error_handler/exceptions -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -clang --version | grep clang | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="clang++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Error macros 'exceptions' Compilation >>>>" -else - echo "****************\n**** Failed Error macros 'exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed Error macros 'exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " Clang - Error macros 'log_errors and exceptions' test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../../../etl_error_handler/log_errors_and_exceptions -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -clang --version | grep clang | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="clang++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Error macros 'log_errors and exceptions' Compilation >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors and exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors and exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi - -cd ../.. - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " All Tests Completed OK" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt diff --git a/test/runtests-O2.sh b/test/runtests-O2.sh deleted file mode 100644 index 93f5e8c9..00000000 --- a/test/runtests-O2.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/sh -clear - -mkdir -p build-make || exit 1 -cd build-make || exit 1 - -echo "ETL Tests" > log.txt - -opt="-O2" - -#****************************************************************************** -# GCC -#****************************************************************************** -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " GCC - STL" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -rm * -rf -gcc --version | grep gcc | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="g++" -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Compilation >>>>" -else - echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " GCC - Initializer list test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../etl_initializer_list/ -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -gcc --version | grep gcc | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="g++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed initializer_list Compilation >>>>" -else - echo "****************\n**** Failed initializer_list ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " Clang - Initializer list test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -rm * -rf -clang --version | grep clang | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="clang++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed initializer_list Compilation >>>>" -else - echo "****************\n**** Failed initializer_list ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " GCC - Error macros 'log_errors' test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../../etl_error_handler/log_errors -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -gcc --version | grep gcc | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="g++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Error macros 'log_errors' Compilation >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors' ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors' ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " GCC - Error macros 'exceptions' test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../../../etl_error_handler/exceptions -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -gcc --version | grep gcc | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="g++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Error macros 'exceptions' Compilation >>>>" -else - echo "****************\n**** Failed Error macros 'exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed Error macros 'exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " GCC - Error macros 'log_errors and exceptions' test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../../../etl_error_handler/log_errors_and_exceptions -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -gcc --version | grep gcc | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="g++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Error macros 'log_errors and exceptions' Compilation >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors and exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors and exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " Clang - Error macros 'log_errors' test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../../../etl_error_handler/log_errors -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -clang --version | grep clang | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="clang++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Error macros 'log_errors' Compilation >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors' ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors' ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " Clang - Error macros 'exceptions' test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../../../etl_error_handler/exceptions -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -clang --version | grep clang | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="clang++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Error macros 'exceptions' Compilation >>>>" -else - echo "****************\n**** Failed Error macros 'exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed Error macros 'exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " Clang - Error macros 'log_errors and exceptions' test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../../../etl_error_handler/log_errors_and_exceptions -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -clang --version | grep clang | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="clang++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Error macros 'log_errors and exceptions' Compilation >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors and exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors and exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi - -cd ../.. - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " All Tests Completed OK" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt diff --git a/test/runtests-O3.sh b/test/runtests-O3.sh deleted file mode 100644 index 4550ca10..00000000 --- a/test/runtests-O3.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/sh -clear - -mkdir -p build-make || exit 1 -cd build-make || exit 1 - -echo "ETL Tests" > log.txt - -opt="-O3" - -#****************************************************************************** -# GCC -#****************************************************************************** -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " GCC - STL" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -rm * -rf -gcc --version | grep gcc | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="g++" -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Compilation >>>>" -else - echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " GCC - Initializer list test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../etl_initializer_list/ -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -gcc --version | grep gcc | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="g++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed initializer_list Compilation >>>>" -else - echo "****************\n**** Failed initializer_list ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " Clang - Initializer list test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -rm * -rf -clang --version | grep clang | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="clang++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed initializer_list Compilation >>>>" -else - echo "****************\n**** Failed initializer_list ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " GCC - Error macros 'log_errors' test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../../etl_error_handler/log_errors -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -gcc --version | grep gcc | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="g++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Error macros 'log_errors' Compilation >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors' ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors' ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " GCC - Error macros 'exceptions' test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../../../etl_error_handler/exceptions -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -gcc --version | grep gcc | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="g++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Error macros 'exceptions' Compilation >>>>" -else - echo "****************\n**** Failed Error macros 'exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed Error macros 'exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " GCC - Error macros 'log_errors and exceptions' test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../../../etl_error_handler/log_errors_and_exceptions -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -gcc --version | grep gcc | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="g++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Error macros 'log_errors and exceptions' Compilation >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors and exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors and exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " Clang - Error macros 'log_errors' test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../../../etl_error_handler/log_errors -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -clang --version | grep clang | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="clang++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Error macros 'log_errors' Compilation >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors' ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors' ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " Clang - Error macros 'exceptions' test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../../../etl_error_handler/exceptions -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -clang --version | grep clang | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="clang++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Error macros 'exceptions' Compilation >>>>" -else - echo "****************\n**** Failed Error macros 'exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed Error macros 'exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " Clang - Error macros 'log_errors and exceptions' test" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt -cd ../../../etl_error_handler/log_errors_and_exceptions -mkdir -p build-make || exit 1 -cd build-make || exit 1 -rm * -rf -clang --version | grep clang | tee -a log.txt -cmake -DCMAKE_CXX_COMPILER="clang++" -DETL_OPTIMISATION=$opt .. -make -j4 -if [ $? -eq 0 ]; then - echo "<<<< Passed Error macros 'log_errors and exceptions' Compilation >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors and exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi -./etl_tests -if [ $? -eq 0 ]; then - echo "<<<< Passed Tests >>>>" -else - echo "****************\n**** Failed Error macros 'log_errors and exceptions' ****\n****************" | tee -a ../log.txt - exit $? -fi - -cd ../.. - -echo "" -echo "-----------------------------------------------" | tee -a log.txt -echo " All Tests Completed OK" | tee -a log.txt -echo "-----------------------------------------------" | tee -a log.txt From 7bff038047f295f1e1a693f450309201042af5ba Mon Sep 17 00:00:00 2001 From: Pasi Miettinen Date: Thu, 6 Apr 2023 16:41:06 +0300 Subject: [PATCH 3/3] circular_buffer: Remove extra semicolon (#683) * Update README.md * Update README.md * Update a \param in basic_string.h (#681) Co-authored-by: Max Hughson * circular_buffer: Remove extra semicolon --------- Co-authored-by: John Wellbelove Co-authored-by: Max Hughson <38259768+hughsonm@users.noreply.github.com> Co-authored-by: Max Hughson Co-authored-by: Pasi Miettinen --- README.md | 6 +++--- include/etl/basic_string.h | 2 +- include/etl/circular_buffer.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 56c457b3..cce503dc 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ Embedded Template Library (ETL) [![Standard](https://img.shields.io/badge/c%2B%2B-98/03/11/14/17-blue.svg)](https://en.wikipedia.org/wiki/C%2B%2B#Standardization) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT) -![CI](https://github.com/ETLCPP/etl/workflows/vs2019/badge.svg) -![CI](https://github.com/ETLCPP/etl/workflows/gcc/badge.svg) -![CI](https://github.com/ETLCPP/etl/workflows/clang/badge.svg) +![CI](https://github.com/ETLCPP/etl/workflows/msvc/badge.svg?branch=master) +![CI](https://github.com/ETLCPP/etl/workflows/gcc/badge.svg?branch=master) +![CI](https://github.com/ETLCPP/etl/workflows/clang/badge.svg?branch=master) [![Build status](https://ci.appveyor.com/api/projects/status/b7jgecv7unqjw4u0/branch/master?svg=true)](https://ci.appveyor.com/project/jwellbelove/etl/branch/master) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/3c14cd918ccf40008d0bcd7b083d5946)](https://www.codacy.com/manual/jwellbelove/etl?utm_source=github.com&utm_medium=referral&utm_content=ETLCPP/etl&utm_campaign=Badge_Grade) diff --git a/include/etl/basic_string.h b/include/etl/basic_string.h index 44892033..66489078 100644 --- a/include/etl/basic_string.h +++ b/include/etl/basic_string.h @@ -1315,7 +1315,7 @@ namespace etl //********************************************************************* /// Copies a portion of a string. - ///\param s Pointer to the string to copy. + ///\param dest Pointer to the destination buffer. ///\param count The number of characters to copy. ///\param pos The position to start copying from. //********************************************************************* diff --git a/include/etl/circular_buffer.h b/include/etl/circular_buffer.h index fec89f30..84126f1b 100644 --- a/include/etl/circular_buffer.h +++ b/include/etl/circular_buffer.h @@ -170,7 +170,7 @@ namespace etl size_type buffer_size; size_type in; ///< Index to the next write. size_type out; ///< Index to the next read. - ETL_DECLARE_DEBUG_COUNT; ///< Internal debugging. + ETL_DECLARE_DEBUG_COUNT ///< Internal debugging. }; //***************************************************************************