summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2021-10-26 12:20:22 +0200
committerHans Ulrich Niedermann <hun@n-dimensional.de>2021-11-03 21:18:55 +0100
commit44a1b1a699d5949adb9cba4dd8b7b52bab812a42 (patch)
tree0e435d216d68e0324c1ee0e37a03415156f8d62b /tests
parentb57d5fdb579da0d330a6890f5e407417ec936567 (diff)
downloadlibgphoto2-44a1b1a699d5949adb9cba4dd8b7b52bab812a42.tar.gz
tests: Remove old pedantic compilation tests
These did not work with C++ on FreeBSD 13 anyway, due to c++98 not working there, which the old pedantic compilation just assumed was working without testing it in configure. The new pedantic compilation tests offer a multitude of language standards including c++98, but only tries building the pedantic compilation tests for those language standards for which configure has shown that building programs is possible at all.
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am52
1 files changed, 1 insertions, 51 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fdccf9a40..7c26b343e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -92,57 +92,7 @@ test_camera_list_LDADD = \
########################################################################
-# Old pedantic compilation test
-########################################################################
-
-if HAVE_GCC
-PEDANTIC_CFLAGS = -std=c99 -pedantic-errors -W -Wall -Wextra -Werror
-PEDANTIC_CXXFLAGS = -std=c++98 -pedantic-errors -W -Wall -Wextra -Werror
-else
-PEDANTIC_CFLAGS =
-PEDANTIC_CXXFLAGS =
-endif
-
-TESTS += test-pedantic-c
-check_PROGRAMS += test-pedantic-c
-test_pedantic_c_SOURCES = test-pedantic-compilation.c
-test_pedantic_c_CPPFLAGS = \
- $(AM_CPPFLAGS) $(CPPFLAGS) \
- -U_GPHOTO2_INTERNAL_CODE
-test_pedantic_c_CFLAGS = \
- $(AM_CFLAGS) $(PEDANTIC_CFLAGS) $(CFLAGS) \
- -U_GPHOTO2_INTERNAL_CODE
-test_pedantic_c_LDADD = \
- $(top_builddir)/libgphoto2/libgphoto2.la \
- $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \
- $(LIBLTDL) \
- $(LIBEXIF_LIBS) \
- $(INTLLIBS)
-
-
-if HAVE_CXX
-check_PROGRAMS += test-pedantic-cxx
-TESTS += test-pedantic-cxx
-else
-EXTRA_PROGRAMS += test-pedantic-cxx
-endif
-test_pedantic_cxx_SOURCES = test-pedantic-compilation.cxx
-test_pedantic_cxx_CPPFLAGS = \
- $(AM_CPPFLAGS) $(CPPFLAGS) \
- -U_GPHOTO2_INTERNAL_CODE
-test_pedantic_cxx_CXXFLAGS = \
- $(AM_CXXFLAGS) $(PEDANTIC_CXXFLAGS) $(CXXFLAGS) \
- -U_GPHOTO2_INTERNAL_CODE
-test_pedantic_cxx_LDADD = \
- $(top_builddir)/libgphoto2/libgphoto2.la \
- $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \
- $(LIBLTDL) \
- $(LIBEXIF_LIBS) \
- $(INTLLIBS)
-
-
-########################################################################
-# Test pendantic compilation for multiple language standard
+# Test pedantic compilation for multiple language standard
########################################################################
generic_pedantic_cppflags =