components/re2c/patches/fix-tests.patch
author Rich Burridge <rich.burridge@oracle.com>
Fri, 23 Oct 2015 15:25:21 -0700
changeset 5006 f2592e203a2a
parent 4945 d9d54aa673b6
child 5589 35e7f040df70
permissions -rw-r--r--
22090327 Remove redundant Userland man page package transforms
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4945
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     1
We need to adjust the script that runs the tests to get them out of the
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     2
build directory not the original source directory and we need to be able
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
to specify an alternate re2c binary when running system tests.
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     4
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
This patch should be sent upstream.
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     6
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     7
--- re2c-0.14.2/run_tests.sh.in.orig	2015-10-13 06:22:20.787156312 -0700
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
+++ re2c-0.14.2/run_tests.sh.in	2015-10-13 06:33:42.229167381 -0700
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
@@ -14,7 +14,7 @@
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
 if uname|grep -q -i 'CYGWIN' && test -x "@WINBUILDDIR@/re2c.exe"; then
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    11
 re2c='@WINBUILDDIR@/re2c.exe'
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    12
 else
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    13
-re2c='@builddir@/re2c'
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
+re2c="${RE2C_BIN:-@builddir@/re2c}"
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
 fi
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    16
 if test ! -x "${re2c}"; then
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    17
   echo "Cannot find re2c executable (${re2c})."
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    18
@@ -33,7 +33,7 @@
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    19
 fi
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    20
 echo "Diffing: ${diff}"
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    21
 if test $# = 0; then
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    22
-tests=`for i in test lessons; do find @top_srcdir@/$i -name '*.re'; done|sort`
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    23
+tests=`for i in test lessons; do find ./$i -name '*.re'; done|sort`
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    24
 else
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    25
 tests="$@"
d9d54aa673b6 21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    26
 fi;