| author | Shawn Walker-Salas <shawn.walker@oracle.com> |
| Wed, 30 Mar 2016 13:33:31 -0700 | |
| changeset 5682 | 94c0ca64c022 |
| parent 4795 | 17cca748f778 |
| permissions | -rw-r--r-- |
|
4795
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
1 |
Patch for system-test target is not appropriate for upstream |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
2 |
|
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
3 |
--- grep-2.20-orig/tests/init.sh 2014-02-08 10:04:29.000000000 -0800 |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
4 |
+++ grep-2.20/tests/init.sh 2015-08-17 14:04:07.099166503 -0700 |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
5 |
@@ -406,11 +406,16 @@ create_exe_shims_ () |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
6 |
|
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
7 |
# Use this function to prepend to PATH an absolute name for each |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
8 |
# specified, possibly-$initial_cwd_-relative, directory. |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
9 |
+ |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
10 |
+# For system-test, we want to test the installed commands, not |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
11 |
+# the ones built in the src directory, so don't prepend src |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
12 |
path_prepend_ () |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
13 |
{
|
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
14 |
while test $# != 0; do |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
15 |
path_dir_=$1 |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
16 |
case $path_dir_ in |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
17 |
+ */src) shift |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
18 |
+ continue;; |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
19 |
'') fail_ "invalid path dir: '$1'";; |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
20 |
/*) abs_path_dir_=$path_dir_;; |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
21 |
*) abs_path_dir_=$initial_cwd_/$path_dir_;; |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
22 |
|
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
23 |
--- grep-2.20-orig/tests/Makefile.in 2015-08-04 15:02:58.000000000 -0700 |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
24 |
+++ grep-2.20/tests/Makefile.in 2015-08-17 14:41:15.351985280 -0700 |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
25 |
@@ -1470,7 +1470,7 @@ TESTS_ENVIRONMENT = \ |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
26 |
PACKAGE_VERSION=$(PACKAGE_VERSION) \ |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
27 |
PERL='$(PERL)' \ |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
28 |
SHELL='$(SHELL)' \ |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
29 |
- PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH" \ |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
30 |
+ PATH="$$PATH" \ |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
31 |
; 9>&2 |
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
32 |
|
|
17cca748f778
21571335 Enable system-test target for ggrep
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
33 |
LOG_COMPILER = $(SHELL) |