Module: ppl/ppl Branch: master Commit: 81b598e7484f1d4b0d3323bafb30578c17149b1d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=81b598e7484f1... Author: Roberto Bagnara <bagnara@cs.unipr.it> Date: Sun Feb 26 08:21:32 2012 +0100 Cater for platforms where no floating-point type is supported. --- configure.ac | 22 ++++++++---------- tests/Concrete_Expression/Makefile.am | 38 +++++++++++++------------------- 2 files changed, 26 insertions(+), 34 deletions(-) diff --git a/configure.ac b/configure.ac index 45acdca..e78909e 100644 --- a/configure.ac +++ b/configure.ac @@ -762,17 +762,15 @@ AC_CXX_DOUBLE_BINARY_FORMAT # Detect the binary format used by C++ long doubles. AC_CXX_LONG_DOUBLE_BINARY_FORMAT -# Check whether the C++ run-time systems provides exact output for -# floats. -#AC_CXX_FLOAT_EXACT_OUTPUT - -# Check whether the C++ run-time systems provides exact output for -# doubles. -#AC_CXX_DOUBLE_EXACT_OUTPUT - -# Check whether the C++ run-time systems provides exact output for -# long doubles. -#AC_CXX_LONG_DOUBLE_EXACT_OUTPUT +# Test if some floating-point type is supported. +if test $ac_supported_float = 1 \ +|| test $ac_supported_double = 1 \ +|| test $ac_supported_long_double = 1 +then + supported_some_floating_point_type=yes +fi +AM_CONDITIONAL(SUPPORTED_SOME_FLOATING_POINT_TYPE, + test x$supported_some_floating_point_type = xyes) # Check whether the C++ compiler supports zero-length arrays. AC_CXX_SUPPORTS_ZERO_LENGTH_ARRAYS @@ -1222,7 +1220,7 @@ fi AM_CONDITIONAL(BUILD_YAP_PROLOG_INTERFACE, test x$build_yap_prolog_interface = xyes) -# Test if *any* Prolog system has to be built. +# Test if some Prolog interfaces have to be built. if test x$build_ciao_prolog_interface = xyes \ || test x$build_gnu_prolog_interface = xyes \ || test x$build_sicstus_prolog_interface = xyes \ diff --git a/tests/Concrete_Expression/Makefile.am b/tests/Concrete_Expression/Makefile.am index 3a79ec1..54b1af8 100644 --- a/tests/Concrete_Expression/Makefile.am +++ b/tests/Concrete_Expression/Makefile.am @@ -52,7 +52,7 @@ $(top_builddir)/tests/libppl_tests.a \ $(top_builddir)/src/libppl.la \ @extra_libraries@ -ORIGINAL_TESTS = \ +ALL_TESTS = \ C_Expr \ linearform1 \ linearize \ @@ -64,9 +64,19 @@ octagonalshape2 \ polyhedron1 \ polyhedron2 -DERIVED_TESTS = +BUGS = + +EXTRA_DIST = $(ALL_TESTS) $(BUGS) + +# There are platforms where no floating-point type is supported. +if SUPPORTED_SOME_FLOATING_POINT_TYPE + +check_PROGRAMS = $(ALL_TESTS) $(BUGS) + +TESTS = run_tests.stamp + +endif SUPPORTED_SOME_FLOATING_POINT_TYPE -ALL_TESTS = $(ORIGINAL_TESTS) $(DERIVED_TESTS) # This will be overridden by the `run_tests' script. if SUPPORTED_FLOAT @@ -83,12 +93,11 @@ LONG_DOUBLE_FLAGS = \ endif endif endif + TEST_CPPFLAGS = $(FLOAT_FLAGS) $(DOUBLE_FLAGS) $(LONG_DOUBLE_FLAGS) dist_check_SCRIPTS = run_tests -TESTS = run_tests.stamp - .PHONY: run_tests.stamp run_tests.stamp: run_tests +MAKE="$(MAKE)" $(srcdir)/run_tests @@ -152,30 +161,15 @@ polyhedron1_SOURCES = polyhedron1.cc polyhedron2_SOURCES = polyhedron2.cc -# -# Sources and compilation flags for the derived check programs -# - -DERIVED_CXXFLAGS = -DDERIVED_TEST $(AM_CXXFLAGS) - -#nnc_frompolyhedron1_SOURCES = frompolyhedron1.cc -#nnc_frompolyhedron1_CXXFLAGS = $(DERIVED_CXXFLAGS) - -BUGS = - -check_PROGRAMS = $(ALL_TESTS) $(BUGS) - -#EXTRA_DIST = $(refinewithconstraints2_SRCS) - -#MOSTLYCLEANFILES = \ -#ascii_dump_load1.dat CLEANFILES = \ run_tests.stamp + DISTCLEANFILES = \ dirty_marker + $(top_builddir)/utils/libppl_utils.a: $(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/utils libppl_utils.a