Make the C++ test mandatory by removing the --no-cxx flag from all.sh

Remove the cmake test
This commit is contained in:
Andrzej Kurek 2018-06-28 04:41:50 -04:00
parent 45a6719594
commit 05be06cc2d

View File

@ -35,7 +35,7 @@
# * GNU Make # * GNU Make
# * CMake # * CMake
# * GCC and Clang (recent enough for using ASan with gcc and MemSan with clang, or valgrind) # * GCC and Clang (recent enough for using ASan with gcc and MemSan with clang, or valgrind)
# * G++, unless invoked with --no-cxx # * G++
# * arm-gcc and mingw-gcc # * arm-gcc and mingw-gcc
# * ArmCC 5 and ArmCC 6, unless invoked with --no-armcc # * ArmCC 5 and ArmCC 6, unless invoked with --no-armcc
# * Yotta build dependencies, unless invoked with --no-yotta # * Yotta build dependencies, unless invoked with --no-yotta
@ -97,7 +97,6 @@ FORCE=0
KEEP_GOING=0 KEEP_GOING=0
RUN_ARMCC=1 RUN_ARMCC=1
YOTTA=1 YOTTA=1
TEST_CXX=1
# Default commands, can be overriden by the environment # Default commands, can be overriden by the environment
: ${OPENSSL:="openssl"} : ${OPENSSL:="openssl"}
@ -132,7 +131,6 @@ General options:
--no-keep-going Stop at the first error (default). --no-keep-going Stop at the first error (default).
--no-memory No additional memory tests (default). --no-memory No additional memory tests (default).
--no-yotta Skip yotta module build. --no-yotta Skip yotta module build.
--no-cxx Skip CXX Compiler build.
--out-of-source-dir=<path> Directory used for CMake out-of-source build tests. --out-of-source-dir=<path> Directory used for CMake out-of-source build tests.
--random-seed Use a random seed value for randomized tests (default). --random-seed Use a random seed value for randomized tests (default).
-r|--release-test Run this script in release mode. This fixes the seed value to 1. -r|--release-test Run this script in release mode. This fixes the seed value to 1.
@ -583,16 +581,9 @@ msg "test/build: key-exchanges (gcc)" # ~ 1 min
cleanup cleanup
record_status tests/scripts/key-exchanges.pl record_status tests/scripts/key-exchanges.pl
if [ $TEST_CXX -ne 0 ]; then msg "build: Unix make, gcc and g++ test" # ~ 30s
msg "build: Unix make, gcc and g++ test" # ~ 30s cleanup
cleanup make TEST_CPP=1
make TEST_CPP=1
msg "build: cmake, gcc and g++ test" # ~ 30s
cleanup
CC=gcc cmake -D TEST_CPP=YES .
make
fi
msg "build: Unix make, -Os (gcc)" # ~ 30s msg "build: Unix make, -Os (gcc)" # ~ 30s
cleanup cleanup