| author | Drew Fisher <drew.fisher@oracle.com> |
| Thu, 13 Oct 2016 12:49:00 -0700 | |
| changeset 7108 | e30b3b76a5ab |
| parent 5589 | 35e7f040df70 |
| permissions | -rw-r--r-- |
|
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 |
|
|
5589
35e7f040df70
22886441 Update re2c to version 0.16
Rich Burridge <rich.burridge@oracle.com>
parents:
4945
diff
changeset
|
7 |
--- re2c-0.16/run_tests.sh.in.orig 2016-03-08 06:11:49.073497153 -0800 |
|
35e7f040df70
22886441 Update re2c to version 0.16
Rich Burridge <rich.burridge@oracle.com>
parents:
4945
diff
changeset
|
8 |
+++ re2c-0.16/run_tests.sh.in 2016-03-08 13:59:57.512468231 -0800 |
|
35e7f040df70
22886441 Update re2c to version 0.16
Rich Burridge <rich.burridge@oracle.com>
parents:
4945
diff
changeset
|
9 |
@@ -28,7 +28,7 @@ |
|
35e7f040df70
22886441 Update re2c to version 0.16
Rich Burridge <rich.burridge@oracle.com>
parents:
4945
diff
changeset
|
10 |
skeleton=0 |
|
35e7f040df70
22886441 Update re2c to version 0.16
Rich Burridge <rich.burridge@oracle.com>
parents:
4945
diff
changeset
|
11 |
keep_tmp_files=0 |
|
35e7f040df70
22886441 Update re2c to version 0.16
Rich Burridge <rich.burridge@oracle.com>
parents:
4945
diff
changeset
|
12 |
wine="" |
|
35e7f040df70
22886441 Update re2c to version 0.16
Rich Burridge <rich.burridge@oracle.com>
parents:
4945
diff
changeset
|
13 |
-re2c="./re2c" |
|
4945
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}"
|
|
5589
35e7f040df70
22886441 Update re2c to version 0.16
Rich Burridge <rich.burridge@oracle.com>
parents:
4945
diff
changeset
|
15 |
threads=`detect_cpu_count; echo $CPUS` |
|
35e7f040df70
22886441 Update re2c to version 0.16
Rich Burridge <rich.burridge@oracle.com>
parents:
4945
diff
changeset
|
16 |
tests=() |
|
35e7f040df70
22886441 Update re2c to version 0.16
Rich Burridge <rich.burridge@oracle.com>
parents:
4945
diff
changeset
|
17 |
for arg in $* |
|
35e7f040df70
22886441 Update re2c to version 0.16
Rich Burridge <rich.burridge@oracle.com>
parents:
4945
diff
changeset
|
18 |
@@ -57,7 +57,7 @@ |
|
35e7f040df70
22886441 Update re2c to version 0.16
Rich Burridge <rich.burridge@oracle.com>
parents:
4945
diff
changeset
|
19 |
test_srcdir="" |
|
35e7f040df70
22886441 Update re2c to version 0.16
Rich Burridge <rich.burridge@oracle.com>
parents:
4945
diff
changeset
|
20 |
if [ ${#tests[@]} -eq 0 ]
|
|
35e7f040df70
22886441 Update re2c to version 0.16
Rich Burridge <rich.burridge@oracle.com>
parents:
4945
diff
changeset
|
21 |
then |
|
35e7f040df70
22886441 Update re2c to version 0.16
Rich Burridge <rich.burridge@oracle.com>
parents:
4945
diff
changeset
|
22 |
- test_srcdir="@top_srcdir@/test" |
|
35e7f040df70
22886441 Update re2c to version 0.16
Rich Burridge <rich.burridge@oracle.com>
parents:
4945
diff
changeset
|
23 |
+ test_srcdir="./test" |
|
35e7f040df70
22886441 Update re2c to version 0.16
Rich Burridge <rich.burridge@oracle.com>
parents:
4945
diff
changeset
|
24 |
tests=(`find $test_srcdir -name '*.re' | sort`) |
|
4945
d9d54aa673b6
21292090 "gmake test" failures for re2c plus hookup system tests
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
fi |
|
5589
35e7f040df70
22886441 Update re2c to version 0.16
Rich Burridge <rich.burridge@oracle.com>
parents:
4945
diff
changeset
|
26 |
test_blddir="test_"`date +%y%m%d%H%M%S` |