From 11b4f669d30fdf0d3bd3afc699cd91540a55bbd8 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 15 Feb 2022 20:58:06 +0000 Subject: [PATCH] Fixed force C++03 implementation flags --- test/etl_profile.h | 1 + test/runsanitychecks.sh | 78 ++++++++++++------------ test/runtests.sh | 16 ++--- test/sanity-check/c++03/CMakeLists.txt | 4 +- test/sanity-check/c++11/CMakeLists.txt | 4 +- test/sanity-check/c++14/CMakeLists.txt | 4 +- test/sanity-check/c++17/CMakeLists.txt | 4 +- test/test_byte.cpp | 82 +++++++++++++------------- 8 files changed, 97 insertions(+), 96 deletions(-) diff --git a/test/etl_profile.h b/test/etl_profile.h index 92883a1d..cd287699 100644 --- a/test/etl_profile.h +++ b/test/etl_profile.h @@ -101,6 +101,7 @@ SOFTWARE. #define ETL_FSM_FORCE_CPP03_IMPLEMENTATION #define ETL_DELEGATE_FORCE_CPP03_IMPLEMENTATION #define ETL_SINGLETON_FORCE_CPP03_IMPLEMENTATION + #define ETL_BYTE_FORCE_CPP03_IMPLEMENTATION #endif #if defined(ETL_FORCE_TEST_CPP11) diff --git a/test/runsanitychecks.sh b/test/runsanitychecks.sh index 15a1aac4..a0b5dec7 100755 --- a/test/runsanitychecks.sh +++ b/test/runsanitychecks.sh @@ -17,7 +17,7 @@ echo "-----------------------------------------------" echo "GCC - STL"; } | tee -a ../log.txt g++ --version | head --lines=1 | tee -a ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bgcc if [ $? -eq 0 ]; then echo "Passed" @@ -28,7 +28,7 @@ fi { echo ""; echo "GCC - No STL"; } | tee -a ../log.txt g++ --version | head --lines=1 | tee -a ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bgcc if [ $? -eq 0 ]; then echo "Passed" @@ -39,7 +39,7 @@ fi { echo ""; echo "GCC - No STL - Force Builtins"; } | tee -a ../log.txt g++ --version | head --lines=1 | tee -a ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bgcc if [ $? -eq 0 ]; then echo "Passed" @@ -50,7 +50,7 @@ fi ##{ echo ""; echo "GCC - No STL - User defined traits"; } | tee -a ../log.txt #g++ --version | head --lines=1 | tee -a ../log.txt -#CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON -DETL_FORCE_TEST_CPP03=OFF .. +#CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. #cmake --build bgcc #if [ $? -eq 0 ]; then # echo "Passed" @@ -61,7 +61,7 @@ fi { echo ""; echo "Clang - STL"; } | tee -a ../log.txt clang++ --version | head --lines=1 | tee -a ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bclang if [ $? -eq 0 ]; then echo "Passed" @@ -72,7 +72,7 @@ fi { echo ""; echo "Clang - No STL"; } | tee -a ../log.txt clang++ --version | head --lines=1 | tee -a ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bclang if [ $? -eq 0 ]; then echo "Passed" @@ -83,7 +83,7 @@ fi { echo ""; echo "Clang - No STL - Force Builtins"; } | tee -a ../log.txt clang++ --version | head --lines=1 | tee -a ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bclang if [ $? -eq 0 ]; then echo "Passed" @@ -94,7 +94,7 @@ fi ##{ echo ""; echo "Clang - No STL - User defined traits"; } | tee -a ../log.txt #clang++ --version | head --lines=1 | tee -a ../log.txt -#CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON -DETL_FORCE_TEST_CPP03=OFF .. +#CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. #cmake --build bclang #if [ $? -eq 0 ]; then # echo "Passed" @@ -113,7 +113,7 @@ echo "-----------------------------------------------" echo "GCC - STL"; } | tee -a ../log.txt g++ --version | head --lines=1 | tee -a ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bgcc if [ $? -eq 0 ]; then echo "Passed" @@ -124,7 +124,7 @@ fi { echo ""; echo "GCC - STL - Force C++03"; } | tee -a ../log.txt g++ --version | head --lines=1 | tee -a ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=ON .. +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=ON .. cmake --build bgcc if [ $? -eq 0 ]; then echo "Passed" @@ -135,7 +135,7 @@ fi { echo ""; echo "GCC - No STL"; } | tee -a ../log.txt g++ --version | head --lines=1 | tee -a ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bgcc if [ $? -eq 0 ]; then echo "Passed" @@ -146,7 +146,7 @@ fi { echo ""; echo "GCC - No STL - Force Builtins"; } | tee -a ../log.txt g++ --version | head --lines=1 | tee -a ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bgcc if [ $? -eq 0 ]; then echo "Passed" @@ -157,7 +157,7 @@ fi ##{ echo ""; echo "GCC - No STL - User defined traits"; } | tee -a ../log.txt #g++ --version | head --lines=1 | tee -a ../log.txt -#CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON -DETL_FORCE_TEST_CPP03=OFF .. +#CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. #cmake --build bgcc #if [ $? -eq 0 ]; then # echo "Passed" @@ -168,7 +168,7 @@ fi { echo ""; echo "Clang - STL"; } | tee -a ../log.txt clang++ --version | head --lines=1 | tee -a ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bclang if [ $? -eq 0 ]; then echo "Passed" @@ -179,7 +179,7 @@ fi { echo ""; echo "Clang - STL - Force C++03"; } | tee -a ../log.txt clang++ --version | head --lines=1 | tee -a ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=ON .. +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=ON .. cmake --build bclang if [ $? -eq 0 ]; then echo "Passed" @@ -190,7 +190,7 @@ fi { echo ""; echo "Clang - No STL"; } | tee -a ../log.txt clang++ --version | head --lines=1 | tee -a ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bclang if [ $? -eq 0 ]; then echo "Passed" @@ -201,7 +201,7 @@ fi { echo ""; echo "Clang - No STL - Force Builtins"; } | tee -a ../log.txt clang++ --version | head --lines=1 | tee -a ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bclang if [ $? -eq 0 ]; then echo "Passed" @@ -212,7 +212,7 @@ fi ##{ echo ""; echo "Clang - No STL - User defined traits"; } | tee -a ../log.txt #clang++ --version | head --lines=1 | tee -a ../log.txt -#CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON -DETL_FORCE_TEST_CPP03=OFF .. +#CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. #cmake --build bclang #if [ $? -eq 0 ]; then # echo "Passed" @@ -231,7 +231,7 @@ echo "-----------------------------------------------" echo "GCC - STL"; } | tee -a ../log.txt g++ --version | head --lines=1 | tee -a ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bgcc if [ $? -eq 0 ]; then echo "Passed" @@ -242,7 +242,7 @@ fi { echo ""; echo "GCC - STL - Force C++03"; } | tee -a ../log.txt g++ --version | head --lines=1 | tee -a ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=ON .. +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=ON .. cmake --build bgcc if [ $? -eq 0 ]; then echo "Passed" @@ -253,7 +253,7 @@ fi { echo ""; echo "GCC - No STL"; } | tee -a ../log.txt g++ --version | head --lines=1 | tee -a ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bgcc if [ $? -eq 0 ]; then echo "Passed" @@ -264,7 +264,7 @@ fi { echo ""; echo "GCC - No STL - Force Builtins"; } | tee -a ../log.txt g++ --version | head --lines=1 | tee -a ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bgcc if [ $? -eq 0 ]; then echo "Passed" @@ -275,7 +275,7 @@ fi ##{ echo ""; echo "GCC - No STL - User defined traits"; } | tee -a ../log.txt #g++ --version | head --lines=1 | tee -a ../log.txt -#CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON -DETL_FORCE_TEST_CPP03=OFF .. +#CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. #cmake --build bgcc #if [ $? -eq 0 ]; then # echo "Passed" @@ -286,7 +286,7 @@ fi { echo ""; echo "Clang - STL"; } | tee -a ../log.txt clang++ --version | head --lines=1 | tee -a ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bclang if [ $? -eq 0 ]; then echo "Passed" @@ -297,7 +297,7 @@ fi { echo ""; echo "Clang - STL - Force C++03"; } | tee -a ../log.txt clang++ --version | head --lines=1 | tee -a ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=ON .. +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=ON .. cmake --build bclang if [ $? -eq 0 ]; then echo "Passed" @@ -308,7 +308,7 @@ fi { echo ""; echo "Clang - No STL"; } | tee -a ../log.txt clang++ --version | head --lines=1 | tee -a ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bclang if [ $? -eq 0 ]; then echo "Passed" @@ -319,7 +319,7 @@ fi { echo ""; echo "Clang - No STL - Force Builtins"; } | tee -a ../log.txt clang++ --version | head --lines=1 | tee -a ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bclang if [ $? -eq 0 ]; then echo "Passed" @@ -330,7 +330,7 @@ fi ##{ echo ""; echo "Clang - No STL - User defined traits"; } | tee -a ../log.txt #clang++ --version | head --lines=1 | tee -a ../log.txt -#CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON -DETL_FORCE_TEST_CPP03=OFF .. +#CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. #cmake --build bclang #if [ $? -eq 0 ]; then # echo "Passed" @@ -349,7 +349,7 @@ echo "-----------------------------------------------" echo "GCC - STL"; } | tee -a ../log.txt g++ --version | head --lines=1 | tee -a ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bgcc if [ $? -eq 0 ]; then echo "Passed" @@ -360,7 +360,7 @@ fi { echo ""; echo "GCC - STL - Force C++03"; } | tee -a ../log.txt g++ --version | head --lines=1 | tee -a ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=ON .. +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=ON .. cmake --build bgcc if [ $? -eq 0 ]; then echo "Passed" @@ -371,7 +371,7 @@ fi { echo ""; echo "GCC - No STL"; } | tee -a ../log.txt g++ --version | head --lines=1 | tee -a ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bgcc if [ $? -eq 0 ]; then echo "Passed" @@ -382,7 +382,7 @@ fi { echo ""; echo "GCC - No STL - Force C++03"; } | tee -a ../log.txt g++ --version | head --lines=1 | tee -a ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=ON .. +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=ON .. cmake --build bgcc if [ $? -eq 0 ]; then echo "Passed" @@ -393,7 +393,7 @@ fi { echo ""; echo "GCC - No STL - Force Builtins"; } | tee -a ../log.txt g++ --version | head --lines=1 | tee -a ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bgcc if [ $? -eq 0 ]; then echo "Passed" @@ -404,7 +404,7 @@ fi ##{ echo ""; echo "GCC - No STL - User defined traits"; } | tee -a ../log.txt #g++ --version | head --lines=1 | tee -a ../log.txt -#CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON -DETL_FORCE_TEST_CPP03=OFF .. +#CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. #cmake --build bgcc #if [ $? -eq 0 ]; then # echo "Passed" @@ -415,7 +415,7 @@ fi { echo ""; echo "Clang - STL"; } | tee -a ../log.txt clang++ --version | head --lines=1 | tee -a ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bclang if [ $? -eq 0 ]; then echo "Passed" @@ -426,7 +426,7 @@ fi { echo ""; echo "Clang - STL - Force C++03"; } | tee -a ../log.txt clang++ --version | head --lines=1 | tee -a ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=ON .. +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=ON .. cmake --build bclang if [ $? -eq 0 ]; then echo "Passed" @@ -437,7 +437,7 @@ fi { echo ""; echo "Clang - No STL"; } | tee -a ../log.txt clang++ --version | head --lines=1 | tee -a ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bclang if [ $? -eq 0 ]; then echo "Passed" @@ -448,7 +448,7 @@ fi { echo ""; echo "Clang - No STL - Force Builtins"; } | tee -a ../log.txt clang++ --version | head --lines=1 | tee -a ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. cmake --build bclang if [ $? -eq 0 ]; then echo "Passed" @@ -459,7 +459,7 @@ fi ##{ echo ""; echo "Clang - No STL - User defined traits"; } | tee -a ../log.txt #clang++ --version | head --lines=1 | tee -a ../log.txt -#CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON -DETL_FORCE_TEST_CPP03=OFF .. +#CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. #cmake --build bclang #if [ $? -eq 0 ]; then # echo "Passed" diff --git a/test/runtests.sh b/test/runtests.sh index 9507fa93..cb7d8833 100755 --- a/test/runtests.sh +++ b/test/runtests.sh @@ -14,7 +14,7 @@ echo "-----------------------------------------------" | tee -a log.txt echo " GCC - STL" | tee -a log.txt echo "-----------------------------------------------" | tee -a log.txt gcc --version | grep gcc | tee -a log.txt -CC=gcc CXX=g++ cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=gcc CXX=g++ cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. make -j8 if [ $? -eq 0 ]; then echo "<<<< Passed >>>>" @@ -34,7 +34,7 @@ echo "-----------------------------------------------" | tee -a log.txt echo " GCC - STL - Force C++03" | tee -a log.txt echo "-----------------------------------------------" | tee -a log.txt gcc --version | grep gcc | tee -a log.txt -CC=gcc CXX=g++ cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=ON .. +CC=gcc CXX=g++ cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=ON .. make -j8 if [ $? -eq 0 ]; then echo "<<<< Passed >>>>" @@ -54,7 +54,7 @@ echo "-----------------------------------------------" | tee -a log.txt echo " GCC - No STL" | tee -a log.txt echo "-----------------------------------------------" | tee -a log.txt gcc --version | grep gcc | tee -a log.txt -CC=gcc CXX=g++ cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=gcc CXX=g++ cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. make -j8 if [ $? -eq 0 ]; then echo "<<<< Passed >>>>" @@ -74,7 +74,7 @@ echo "-----------------------------------------------" | tee -a log.txt echo " GCC - No STL - Force Builtins" | tee -a log.txt echo "-----------------------------------------------" | tee -a log.txt gcc --version | grep gcc | tee -a log.txt -CC=gcc CXX=g++ cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=gcc CXX=g++ cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. make -j8 if [ $? -eq 0 ]; then echo "<<<< Passed >>>>" @@ -98,7 +98,7 @@ echo "-----------------------------------------------" | tee -a log.txt echo " Clang - STL" | tee -a log.txt echo "-----------------------------------------------" | tee -a log.txt clang --version | grep clang | tee -a log.txt -CC=clang CXX=clang++ cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=clang CXX=clang++ cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. make -j8 if [ $? -eq 0 ]; then echo "<<<< Passed >>>>" @@ -118,7 +118,7 @@ echo "-----------------------------------------------" | tee -a log.txt echo " Clang - STL - Force C++03" | tee -a log.txt echo "-----------------------------------------------" | tee -a log.txt clang --version | grep clang | tee -a log.txt -CC=clang CXX=clang++ cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=ON .. +CC=clang CXX=clang++ cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=ON .. make -j8 if [ $? -eq 0 ]; then echo "<<<< Passed >>>>" @@ -138,7 +138,7 @@ echo "-----------------------------------------------" | tee -a log.txt echo " Clang - No STL" | tee -a log.txt echo "-----------------------------------------------" | tee -a log.txt clang --version | grep clang | tee -a log.txt -CC=clang CXX=clang++ cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=clang CXX=clang++ cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USE_MEM_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. make -j8 if [ $? -eq 0 ]; then echo "<<<< Passed >>>>" @@ -158,7 +158,7 @@ echo "-----------------------------------------------" | tee -a log.txt echo " Clang - No STL - Builtins" | tee -a log.txt echo "-----------------------------------------------" | tee -a log.txt clang --version | grep clang | tee -a log.txt -CC=clang CXX=clang++ cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF .. +CC=clang CXX=clang++ cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USE_MEM_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF .. make -j8 if [ $? -eq 0 ]; then echo "<<<< Passed >>>>" diff --git a/test/sanity-check/c++03/CMakeLists.txt b/test/sanity-check/c++03/CMakeLists.txt index a0cafc6c..0d93e000 100644 --- a/test/sanity-check/c++03/CMakeLists.txt +++ b/test/sanity-check/c++03/CMakeLists.txt @@ -27,9 +27,9 @@ if (ETL_USER_DEFINED_TYPE_TRAITS) add_definitions(-DETL_USER_DEFINED_TYPE_TRAITS) endif() -if (ETL_FORCE_TEST_CPP03) +if (ETL_FORCE_TEST_CPP03_IMPLEMENTATION) message(STATUS "Compiling for C++03 tests") - add_definitions(-DETL_FORCE_TEST_CPP03) + add_definitions(-DETL_FORCE_TEST_CPP03_IMPLEMENTATION) endif() add_library(t98 OBJECT) diff --git a/test/sanity-check/c++11/CMakeLists.txt b/test/sanity-check/c++11/CMakeLists.txt index 730823f7..3ffdaa23 100644 --- a/test/sanity-check/c++11/CMakeLists.txt +++ b/test/sanity-check/c++11/CMakeLists.txt @@ -27,9 +27,9 @@ if (ETL_USER_DEFINED_TYPE_TRAITS) add_definitions(-DETL_USER_DEFINED_TYPE_TRAITS) endif() -if (ETL_FORCE_TEST_CPP03) +if (ETL_FORCE_TEST_CPP03_IMPLEMENTATION) message(STATUS "Compiling for C++03 tests") - add_definitions(-DETL_FORCE_TEST_CPP03) + add_definitions(-DETL_FORCE_TEST_CPP03_IMPLEMENTATION) endif() add_library(t11 OBJECT) diff --git a/test/sanity-check/c++14/CMakeLists.txt b/test/sanity-check/c++14/CMakeLists.txt index 0a96a560..1d22b9c0 100644 --- a/test/sanity-check/c++14/CMakeLists.txt +++ b/test/sanity-check/c++14/CMakeLists.txt @@ -27,9 +27,9 @@ if (ETL_USER_DEFINED_TYPE_TRAITS) add_definitions(-DETL_USER_DEFINED_TYPE_TRAITS) endif() -if (ETL_FORCE_TEST_CPP03) +if (ETL_FORCE_TEST_CPP03_IMPLEMENTATION) message(STATUS "Compiling for C++03 tests") - add_definitions(-DETL_FORCE_TEST_CPP03) + add_definitions(-DETL_FORCE_TEST_CPP03_IMPLEMENTATION) endif() add_library(t14 OBJECT) diff --git a/test/sanity-check/c++17/CMakeLists.txt b/test/sanity-check/c++17/CMakeLists.txt index 9f938ed0..5bbbb73e 100644 --- a/test/sanity-check/c++17/CMakeLists.txt +++ b/test/sanity-check/c++17/CMakeLists.txt @@ -27,9 +27,9 @@ if (ETL_USER_DEFINED_TYPE_TRAITS) add_definitions(-DETL_USER_DEFINED_TYPE_TRAITS) endif() -if (ETL_FORCE_TEST_CPP03) +if (ETL_FORCE_TEST_CPP03_IMPLEMENTATION) message(STATUS "Compiling for C++03 tests") - add_definitions(-DETL_FORCE_TEST_CPP03) + add_definitions(-DETL_FORCE_TEST_CPP03_IMPLEMENTATION) endif() add_library(t17 OBJECT) diff --git a/test/test_byte.cpp b/test/test_byte.cpp index e026e959..74c3a0f8 100644 --- a/test/test_byte.cpp +++ b/test/test_byte.cpp @@ -62,15 +62,15 @@ namespace etl::byte b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B << 0U), (unsigned char)(b << 0U)); - CHECK_EQUAL((unsigned char)(B << 1U), (unsigned char)(b << 1U)); - CHECK_EQUAL((unsigned char)(B << 2U), (unsigned char)(b << 2U)); - CHECK_EQUAL((unsigned char)(B << 3U), (unsigned char)(b << 3U)); - CHECK_EQUAL((unsigned char)(B << 4U), (unsigned char)(b << 4U)); - CHECK_EQUAL((unsigned char)(B << 5U), (unsigned char)(b << 5U)); - CHECK_EQUAL((unsigned char)(B << 6U), (unsigned char)(b << 6U)); - CHECK_EQUAL((unsigned char)(B << 7U), (unsigned char)(b << 7U)); - CHECK_EQUAL((unsigned char)(B << 8U), (unsigned char)(b << 8U)); + CHECK_EQUAL((unsigned char)(B << 0U), etl::to_integer(b << 0U)); + CHECK_EQUAL((unsigned char)(B << 1U), etl::to_integer(b << 1U)); + CHECK_EQUAL((unsigned char)(B << 2U), etl::to_integer(b << 2U)); + CHECK_EQUAL((unsigned char)(B << 3U), etl::to_integer(b << 3U)); + CHECK_EQUAL((unsigned char)(B << 4U), etl::to_integer(b << 4U)); + CHECK_EQUAL((unsigned char)(B << 5U), etl::to_integer(b << 5U)); + CHECK_EQUAL((unsigned char)(B << 6U), etl::to_integer(b << 6U)); + CHECK_EQUAL((unsigned char)(B << 7U), etl::to_integer(b << 7U)); + CHECK_EQUAL((unsigned char)(B << 8U), etl::to_integer(b << 8U)); } //************************************************************************* @@ -81,23 +81,23 @@ namespace etl::byte b; b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B << 0U), (unsigned char)(b <<= 0U)); + CHECK_EQUAL((unsigned char)(B << 0U), etl::to_integer(b <<= 0U)); b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B << 1U), (unsigned char)(b <<= 1U)); + CHECK_EQUAL((unsigned char)(B << 1U), etl::to_integer(b <<= 1U)); b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B << 2U), (unsigned char)(b <<= 2U)); + CHECK_EQUAL((unsigned char)(B << 2U), etl::to_integer(b <<= 2U)); b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B << 3U), (unsigned char)(b <<= 3U)); + CHECK_EQUAL((unsigned char)(B << 3U), etl::to_integer(b <<= 3U)); b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B << 4U), (unsigned char)(b <<= 4U)); + CHECK_EQUAL((unsigned char)(B << 4U), etl::to_integer(b <<= 4U)); b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B << 5U), (unsigned char)(b <<= 5U)); + CHECK_EQUAL((unsigned char)(B << 5U), etl::to_integer(b <<= 5U)); b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B << 6U), (unsigned char)(b <<= 6U)); + CHECK_EQUAL((unsigned char)(B << 6U), etl::to_integer(b <<= 6U)); b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B << 7U), (unsigned char)(b <<= 7U)); + CHECK_EQUAL((unsigned char)(B << 7U), etl::to_integer(b <<= 7U)); b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B << 8U), (unsigned char)(b <<= 8U)); + CHECK_EQUAL((unsigned char)(B << 8U), etl::to_integer(b <<= 8U)); } //************************************************************************* @@ -107,14 +107,14 @@ namespace etl::byte b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B >> 0U), (unsigned char)(b >> 0U)); - CHECK_EQUAL((unsigned char)(B >> 1U), (unsigned char)(b >> 1U)); - CHECK_EQUAL((unsigned char)(B >> 2U), (unsigned char)(b >> 2U)); - CHECK_EQUAL((unsigned char)(B >> 3U), (unsigned char)(b >> 3U)); - CHECK_EQUAL((unsigned char)(B >> 4U), (unsigned char)(b >> 4U)); - CHECK_EQUAL((unsigned char)(B >> 5U), (unsigned char)(b >> 5U)); - CHECK_EQUAL((unsigned char)(B >> 6U), (unsigned char)(b >> 6U)); - CHECK_EQUAL((unsigned char)(B >> 7U), (unsigned char)(b >> 7U)); + CHECK_EQUAL((unsigned char)(B >> 0U), etl::to_integer(b >> 0U)); + CHECK_EQUAL((unsigned char)(B >> 1U), etl::to_integer(b >> 1U)); + CHECK_EQUAL((unsigned char)(B >> 2U), etl::to_integer(b >> 2U)); + CHECK_EQUAL((unsigned char)(B >> 3U), etl::to_integer(b >> 3U)); + CHECK_EQUAL((unsigned char)(B >> 4U), etl::to_integer(b >> 4U)); + CHECK_EQUAL((unsigned char)(B >> 5U), etl::to_integer(b >> 5U)); + CHECK_EQUAL((unsigned char)(B >> 6U), etl::to_integer(b >> 6U)); + CHECK_EQUAL((unsigned char)(B >> 7U), etl::to_integer(b >> 7U)); } } @@ -126,21 +126,21 @@ namespace etl::byte b; b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B >> 0U), (unsigned char)(b >>= 0U)); + CHECK_EQUAL((unsigned char)(B >> 0U), etl::to_integer(b >>= 0U)); b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B >> 1U), (unsigned char)(b >>= 1U)); + CHECK_EQUAL((unsigned char)(B >> 1U), etl::to_integer(b >>= 1U)); b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B >> 2U), (unsigned char)(b >>= 2U)); + CHECK_EQUAL((unsigned char)(B >> 2U), etl::to_integer(b >>= 2U)); b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B >> 3U), (unsigned char)(b >>= 3U)); + CHECK_EQUAL((unsigned char)(B >> 3U), etl::to_integer(b >>= 3U)); b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B >> 4U), (unsigned char)(b >>= 4U)); + CHECK_EQUAL((unsigned char)(B >> 4U), etl::to_integer(b >>= 4U)); b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B >> 5U), (unsigned char)(b >>= 5U)); + CHECK_EQUAL((unsigned char)(B >> 5U), etl::to_integer(b >>= 5U)); b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B >> 6U), (unsigned char)(b >>= 6U)); + CHECK_EQUAL((unsigned char)(B >> 6U), etl::to_integer(b >>= 6U)); b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B >> 7U), (unsigned char)(b >>= 7U)); + CHECK_EQUAL((unsigned char)(B >> 7U), etl::to_integer(b >>= 7U)); } //************************************************************************* @@ -152,7 +152,7 @@ namespace for (unsigned int i = 0; i < 256; ++i) { - CHECK_EQUAL((unsigned char)(B & i), (unsigned char)(b & etl::byte(i))); + CHECK_EQUAL((unsigned char)(B & i), etl::to_integer(b & etl::byte(i))); } } @@ -166,7 +166,7 @@ namespace for (unsigned int i = 0; i < 256; ++i) { b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B & i), (unsigned char)(b &= etl::byte(i))); + CHECK_EQUAL((unsigned char)(B & i), etl::to_integer(b &= etl::byte(i))); } } @@ -179,7 +179,7 @@ namespace for (unsigned int i = 0; i < 256; ++i) { - CHECK_EQUAL((unsigned char)(B | i), (unsigned char)(b | etl::byte(i))); + CHECK_EQUAL((unsigned char)(B | i), etl::to_integer(b | etl::byte(i))); } } @@ -193,7 +193,7 @@ namespace for (unsigned int i = 0; i < 256; ++i) { b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B | i), (unsigned char)(b |= etl::byte(i))); + CHECK_EQUAL((unsigned char)(B | i), etl::to_integer(b |= etl::byte(i))); } } @@ -206,7 +206,7 @@ namespace for (unsigned int i = 0; i < 256; ++i) { - CHECK_EQUAL((unsigned char)(B ^ i), (unsigned char)(b ^ etl::byte(i))); + CHECK_EQUAL((unsigned char)(B ^ i), etl::to_integer(b ^ etl::byte(i))); } } @@ -220,7 +220,7 @@ namespace for (unsigned int i = 0; i < 256; ++i) { b = etl::byte(B); - CHECK_EQUAL((unsigned char)(B ^ i), (unsigned char)(b ^= etl::byte(i))); + CHECK_EQUAL((unsigned char)(B ^ i), etl::to_integer(b ^= etl::byte(i))); } } @@ -229,7 +229,7 @@ namespace { for (unsigned int i = 0; i < 256; ++i) { - CHECK_EQUAL((unsigned char)(~i), (unsigned char)(~etl::byte(i))); + CHECK_EQUAL((unsigned char)(~i), etl::to_integer(~etl::byte(i))); } } }