add C++ compile check
diff --git a/tests/tests-c-compiler/Makefile.am b/tests/tests-c-compiler/Makefile.am
index 314903a..db0497c 100644
--- a/tests/tests-c-compiler/Makefile.am
+++ b/tests/tests-c-compiler/Makefile.am
@@ -10,6 +10,7 @@
TESTS_ENVIRONMENT= \
CC="${CC}" \
+ CXX="${CXX}" \
CFLAGS="${TESTSUITE_CFLAGS} ${CFLAGS}" \
CXXFLAGS="${CXXFLAGS}" \
LDFLAGS="${LDFLAGS}" \
@@ -42,6 +43,7 @@
TESTS += check-src/check-41.-fwide-types.c
TESTS += check-src/check-41.c
TESTS += check-src/check-42.c
+TESTS += check-src/check-42.-fwide-types.cc
TESTS += check-src/check-43.c
TESTS += check-src/check-44.c
TESTS += check-src/check-46.c
diff --git a/tests/tests-c-compiler/check-assembly.sh b/tests/tests-c-compiler/check-assembly.sh
index 735d151..a9fb559 100755
--- a/tests/tests-c-compiler/check-assembly.sh
+++ b/tests/tests-c-compiler/check-assembly.sh
@@ -38,7 +38,7 @@
CODECS_FLAGS="${CODECS_FLAGS} -DASN_DISABLE_PER_SUPPORT"
fi
-args=$(echo "$source_short" | sed -e 's/\.c[c]*$//')
+args=$(echo "$source_short" | sed -E -e 's/\.c+$//')
OFS=$IFS
IFS="."
@@ -68,10 +68,11 @@
COMMON_FLAGS= -I.
CFLAGS = \${COMMON_FLAGS} ${CFLAGS:-} -g -O1
CFLAGS += -DSRCDIR=../${srcdir} ${CODECS_FLAGS}
-CXXFLAGS = \${COMMON_FLAGS} ${CXXFLAGS}
+CXXFLAGS = \${CFLAGS} ${CXXFLAGS}
LDFLAGS = ${LDFLAGS:-}
CC ?= ${CC}
+CXX ?= ${CXX}
all: compiled-module
\$(MAKE) check-executable
@@ -109,14 +110,16 @@
if [ ${make_type} = "BSD" ]; then
cat <<-OBJECTS > ${make_file}
${AUTOGENERATED}
- SRCS!=find . -name \*.c
- OBJS=\${SRCS:.c=.o}
+ SRCS_C!=find . -name \*.c
+ SRCS_CXX!=find . -name \*.cc
+ OBJS=\${SRCS_C:.c=.o} ${SRCS_CXX:.cc=.o}
.sinclude <Makefile.targets>
OBJECTS
else
cat <<-OBJECTS > ${make_file}
${AUTOGENERATED}
- OBJS=\$(patsubst %.c,%.o,\$(wildcard *.c))
+ OBJS =\$(patsubst %.c,%.o,\$(wildcard *.c))
+ OBJS+=\$(patsubst %.cc,%.o,\$(wildcard *.cc))
-include Makefile.targets
OBJECTS
fi
diff --git a/tests/tests-c-compiler/check-42.cc b/tests/tests-c-compiler/check-src/check-42.-fwide-types.cc
similarity index 100%
rename from tests/tests-c-compiler/check-42.cc
rename to tests/tests-c-compiler/check-src/check-42.-fwide-types.cc