components/re2c/patches/fix-tests.patch
changeset 5589 35e7f040df70
parent 4945 d9d54aa673b6
equal deleted inserted replaced
5588:33ed1c330eea 5589:35e7f040df70
     2 build directory not the original source directory and we need to be able
     2 build directory not the original source directory and we need to be able
     3 to specify an alternate re2c binary when running system tests.
     3 to specify an alternate re2c binary when running system tests.
     4 
     4 
     5 This patch should be sent upstream.
     5 This patch should be sent upstream.
     6 
     6 
     7 --- re2c-0.14.2/run_tests.sh.in.orig	2015-10-13 06:22:20.787156312 -0700
     7 --- re2c-0.16/run_tests.sh.in.orig	2016-03-08 06:11:49.073497153 -0800
     8 +++ re2c-0.14.2/run_tests.sh.in	2015-10-13 06:33:42.229167381 -0700
     8 +++ re2c-0.16/run_tests.sh.in	2016-03-08 13:59:57.512468231 -0800
     9 @@ -14,7 +14,7 @@
     9 @@ -28,7 +28,7 @@
    10  if uname|grep -q -i 'CYGWIN' && test -x "@WINBUILDDIR@/re2c.exe"; then
    10  skeleton=0
    11  re2c='@WINBUILDDIR@/re2c.exe'
    11  keep_tmp_files=0
    12  else
    12  wine=""
    13 -re2c='@builddir@/re2c'
    13 -re2c="./re2c"
    14 +re2c="${RE2C_BIN:-@builddir@/re2c}"
    14 +re2c="${RE2C_BIN:-@builddir@/re2c}"
       
    15  threads=`detect_cpu_count; echo $CPUS`
       
    16  tests=()
       
    17  for arg in $*
       
    18 @@ -57,7 +57,7 @@
       
    19  test_srcdir=""
       
    20  if [ ${#tests[@]} -eq 0 ]
       
    21  then
       
    22 -    test_srcdir="@top_srcdir@/test"
       
    23 +    test_srcdir="./test"
       
    24      tests=(`find $test_srcdir -name '*.re' | sort`)
    15  fi
    25  fi
    16  if test ! -x "${re2c}"; then
    26  test_blddir="test_"`date +%y%m%d%H%M%S`
    17    echo "Cannot find re2c executable (${re2c})."
       
    18 @@ -33,7 +33,7 @@
       
    19  fi
       
    20  echo "Diffing: ${diff}"
       
    21  if test $# = 0; then
       
    22 -tests=`for i in test lessons; do find @top_srcdir@/$i -name '*.re'; done|sort`
       
    23 +tests=`for i in test lessons; do find ./$i -name '*.re'; done|sort`
       
    24  else
       
    25  tests="$@"
       
    26  fi;