| author | April Chin <april.chin@oracle.com> |
| Mon, 24 Mar 2014 11:33:41 -0700 | |
| branch | s11-update |
| changeset 3002 | baadf45ecbdd |
| parent 327 | b3a36ee93012 |
| permissions | -rw-r--r-- |
|
327
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
1 |
From: Dean Roehrich <[email protected]> |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
2 |
Subject: [Quilt-dev] [patch] use gzip rather than zcat in test/import2.test |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
3 |
Date: Wed, 05 Nov 2008 19:34:14 CST |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
4 |
To: [email protected] |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
5 |
|
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
6 |
The tests expect zcat to understand the .gz suffix, but in the Solaris |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
7 |
environment the zcat is not GNU and it expects a .Z suffix. This modifies |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
8 |
the test to use gzip -dc, instead. |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
9 |
|
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
10 |
Dean |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
11 |
|
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
12 |
|
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
13 |
Index: test/import2.test |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
14 |
=================================================================== |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
15 |
--- test/import2.test.orig 2008-11-05 20:00:39.305395000 -0600 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
16 |
+++ test/import2.test 2008-11-05 20:01:03.827736000 -0600 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
17 |
@@ -90,7 +90,7 @@ |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
18 |
> Replacing patch %{P}patch1.diff.gz with new version
|
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
19 |
|
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
20 |
# an import requiring a description merge |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
21 |
- $ zcat patches/patch1.diff.gz | sed -e 's/original/new/' | gzip > t/patch1.diff.gz |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
22 |
+ $ gzip -dc patches/patch1.diff.gz | sed -e 's/original/new/' | gzip > t/patch1.diff.gz |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
23 |
$ quilt import t/patch1.diff.gz |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
24 |
> Patch %{P}patch1.diff.gz exists. Replace with -f.
|
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
25 |
|
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
26 |
@@ -105,7 +105,7 @@ |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
27 |
> Replacing patch %{P}patch1.diff.gz with new version
|
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
28 |
|
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
29 |
# quilt header does not work in this case because it stops at '---' |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
30 |
- $ zcat patches/patch1.diff.gz | head -n 3 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
31 |
+ $ gzip -dc patches/patch1.diff.gz | head -n 3 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
32 |
> original description |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
33 |
> --- |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
34 |
> new description |