patches/mpfr/2.4.1/150-test-tmul.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
permissions -rw-r--r--
scripts/xldd: use user's sed and grep

xldd uses sed and grep as detected by ./configure. This works well if is
used on the machine that build the toolchain.

But if the user moves the toolchain to another machine where sed and grep
are not in the same directory (eg. /bin/sed vs. /usr/bin/sed), then xldd
will stop functionning.

Fix that by using ${SED} and ${GREP} if they are set in the environment.

Reported-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
     1 diff -up ./tests/Makefile.am.orig ./tests/Makefile.am
     2 --- ./tests/Makefile.am.orig	2009-07-28 16:28:55.377059021 +0300
     3 +++ ./tests/Makefile.am	2009-07-28 16:31:01.136810734 +0300
     4 @@ -20,7 +20,7 @@ check_PROGRAMS = tversion tinternals tin
     5  
     6  EXTRA_DIST = tgeneric.c tgeneric_ui.c mpf_compat.h inp_str.data tmul.dat
     7  
     8 -tmul_CPPFLAGS = -DMPFR_SRCDIR=$(srcdir)
     9 +tmul_CPPFLAGS = -DMPFR_SRCDIR=\"$(srcdir)\"
    10  
    11  LDADD = libfrtests.la $(MPFR_LIBM) $(top_builddir)/libmpfr.la
    12  INCLUDES = -I$(top_srcdir) -I$(top_builddir)
    13 diff -up ./tests/tmul.c.orig ./tests/tmul.c
    14 --- ./tests/tmul.c.orig	2009-07-28 16:29:03.761058919 +0300
    15 +++ ./tests/tmul.c	2009-07-28 16:30:46.369812215 +0300
    16 @@ -26,10 +26,8 @@ MA 02110-1301, USA. */
    17  #include "mpfr-test.h"
    18  
    19  #ifndef MPFR_SRCDIR
    20 -#define MPFR_SRCDIR .
    21 +#define MPFR_SRCDIR "."
    22  #endif
    23 -#define QUOTE(X) NAME(X)
    24 -#define NAME(X) #X
    25  
    26  #ifdef CHECK_EXTERNAL
    27  static int
    28 @@ -482,10 +480,10 @@ check_regression (void)
    29    mpfr_inits2 (6177, x, y, z, (mpfr_ptr) 0);
    30    /* we read long strings from a file since ISO C90 does not support strings of
    31       length > 509 */
    32 -  fp = fopen (QUOTE (MPFR_SRCDIR)"/tmul.dat", "r");
    33 +  fp = fopen (MPFR_SRCDIR "/tmul.dat", "r");
    34    if (fp == NULL)
    35      {
    36 -      fprintf (stderr, "Error, cannot open "QUOTE (MPFR_SRCDIR)"/tmul.dat\n");
    37 +      fprintf (stderr, "Error, cannot open " MPFR_SRCDIR "/tmul.dat\n");
    38        exit (1);
    39      }
    40    get_string (s, fp);