Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/gzip/patches/zgrep-f.patch
author Danek Duvall <danek.duvall@oracle.com>
Fri, 29 Jun 2012 21:49:03 -0700
changeset 904 114a5240af22
parent 755 e7d0aed114ef
permissions -rw-r--r--
7179129 "zfs create" should be able to complete parent datasets 7180931 sync zsh completion functions with build 20
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
755
e7d0aed114ef 7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     1
 
--- gzip-1.4/tests/zgrep-f.orig	2012-03-29 11:21:18.457617592 -0700
e7d0aed114ef 7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     2
 
+++ gzip-1.4/tests/zgrep-f	2012-03-29 11:21:56.078983515 -0700
e7d0aed114ef 7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     3
 
@@ -32,7 +32,7 @@
e7d0aed114ef 7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     4
e7d0aed114ef 7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     5
e7d0aed114ef 7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     6
 
 fail=0
e7d0aed114ef 7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     7
 
-zgrep -f - haystack.gz < n > out 2>&1 || fail=1
e7d0aed114ef 7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     8
 
+zgrep --__bindir /usr/gnu/bin -f - haystack.gz < n > out 2>&1 || fail=1
e7d0aed114ef 7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     9
e7d0aed114ef 7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    10
 
 compare out n || fail=1
e7d0aed114ef 7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    11
upstream/oracle/userland-gate