Ticket #887: cabal-test-filter-autogen.dpatch

File cabal-test-filter-autogen.dpatch, 9.1 KB (added by ttuegel, 20 months ago)

Patch

Line 
11 patch for repository /home/ttuegel/repos/cabal-head:
2
3Fri Sep 23 15:18:06 CDT 2011  Thomas Tuegel <ttuegel@gmail.com>
4  * Filter autogenerated modules from test suite build info when doing sdist.
5
6New patches:
7
8[Filter autogenerated modules from test suite build info when doing sdist.
9Thomas Tuegel <ttuegel@gmail.com>**20110923201806
10 Ignore-this: 6f1eb9a1af8fad0442544d05d2568db9
11] {
12hunk ./cabal/Distribution/Simple/SrcDist.hs 414
13                 -> (PackageDescription -> PackageDescription)
14 mapAllBuildInfo f pkg = pkg {
15     library     = fmap mapLibBi (library pkg),
16-    executables = fmap mapExeBi (executables pkg)
17+    executables = fmap mapExeBi (executables pkg),
18+    testSuites  = fmap mapTestBi (testSuites pkg)
19   }
20   where
21     mapLibBi lib = lib { libBuildInfo = f (libBuildInfo lib) }
22hunk ./cabal/Distribution/Simple/SrcDist.hs 420
23     mapExeBi exe = exe { buildInfo    = f (buildInfo exe) }
24+    mapTestBi t  = t   { testBuildInfo = f (testBuildInfo t) }
25}
26
27Context:
28
29[Change extension name to "ConstraintKinds"
30Duncan Coutts <duncan@community.haskell.org>**20110908220819
31 Ignore-this: a5faf4ded03ba1394278c810a8136bf2
32 For consistency with the rest of the extensions. Requested by SPJ.
33]
34[Add the ConstraintKind extension
35Max Bolingbroke <batterseapower@hotmail.com>**20110906094145
36 Ignore-this: 838aa67afada51bc8f023a24531a0d0d
37]
38[Fix a typo in a QA message
39Duncan Coutts <duncan@community.haskell.org>**20110905001515
40 Ignore-this: e906b589e4acea1121ac193998696751
41]
42[Better error message for unknown build types
43Duncan Coutts <duncan@community.haskell.org>**20110901114046
44 Ignore-this: 91989561ff78edbe3d72b7d569db4561
45]
46[Consistent import of Text.PrettyPrint
47David Terei <davidterei@gmail.com>**20110825180411
48 Ignore-this: 785b7c0aaad8b997678c1e68b90502f8
49]
50[Drop assertion checking in the old solver
51Duncan Coutts <duncan@community.haskell.org>**20110818172118
52 Ignore-this: a516461e7f19e2aa2109fc905ac85
53 Make it a bit faster.
54]
55[Update version constraint on the Cabal library, for 1.12 release.
56Duncan Coutts <duncan@community.haskell.org>**20110818171955
57 Ignore-this: 870a523382e1e0cec2b5cd033c778359
58]
59[Add cabal sdist --zip flag for creating zip archives
60Duncan Coutts <duncan@community.haskell.org>**20110818171721
61 Ignore-this: 86469c0f4f4b72d58b6278c3ef692901
62 Handy if you want to send sources to people who do not grok .tar.gz
63 Requires that the 'zip' program be installed (unlike for .tar.gz where
64 we do it internally so that it works on all systems).
65]
66[Relax cabal-install's deps for ghc-7.2
67Duncan Coutts <duncan@community.haskell.org>**20110812110846
68 Ignore-this: 1524732bffa5cc04e5d475ec4c4f12d8
69]
70[Fix the repo location
71Duncan Coutts <duncan@community.haskell.org>**20110812110820
72 Ignore-this: 1ed9152864fc3336c82495904b1e5612
73]
74[Improve the error message emitted when multiple .cabal files are found
75Duncan Coutts <duncan@community.haskell.org>**20110508223014
76 Ignore-this: 1c96d4f42fe55094f07b0573bb80fda1
77]
78[Add Safe Haskell flags to known extensions
79David Terei <davidterei@gmail.com>**20110810201543
80 Ignore-this: 9e0a42de1539e1a56d72f9a7ecdf554c
81]
82[Change trusted property to be true by default
83David Terei <davidterei@gmail.com>**20110808223228
84 Ignore-this: c46cf169c46b809cf457678f77e02b20
85]
86[Fix for intra-package build-tools dependencies
87Duncan Coutts <duncan@community.haskell.org>**20110808165045
88 Ignore-this: 83f148981c7d8d3c616027975ee8f59a
89]
90[Simplify some code in Program.Hpc slightly
91Duncan Coutts <duncan@community.haskell.org>**20110726001531
92 Ignore-this: d7ea77d1f072f7071fc709e0c9a38ded
93]
94[Added Distribution.Simple.Program.Hpc.
95Thomas Tuegel <ttuegel@gmail.com>**20110719004251
96 Ignore-this: a988f4262e4f52c8ae0a3ca5715a636e
97]
98[Restore graceful failure upon invoking "cabal test" before "cabal build".
99Thomas Tuegel <ttuegel@gmail.com>**20110719002218
100 Ignore-this: 2096a4cfad17eb67ef26bb15a8b3a066
101]
102[Fix executable test suite unit test for improved HPC interface.
103Thomas Tuegel <ttuegel@gmail.com>**20110718033150
104 Ignore-this: b543b01721940b23aac7bd46282425b1
105]
106[Generate aggregate coverage statistics from all test suites in package.
107Thomas Tuegel <ttuegel@gmail.com>**20110718050448
108 Ignore-this: bff5f3167ab61da015b8fcb7c4f77cdc
109]
110[Invoke HPC using D.S.Program utilities.
111Thomas Tuegel <ttuegel@gmail.com>**20110718045949
112 Ignore-this: 37e1f01f594dd522c5328b397ac0e94d
113 This patch also reorganizes the HPC output directories for consistency. All
114 files related to HPC are now located in the "dist/hpc" directory.
115]
116[Fix cabal haddock for packages with internal dependencies
117Duncan Coutts <duncan@community.haskell.org>**20110718235728
118 Ignore-this: 86cdab6325a86875e9ae592881b4f54f
119]
120[Update cabal sdist to follow the changes in the Cabal lib
121Duncan Coutts <duncan@community.haskell.org>**20110717223648
122 Ignore-this: 1136aa98cb024a10250ea75ec8633a2c
123]
124[Added unit test for test options.
125Thomas Tuegel <ttuegel@gmail.com>**20110521164529
126 Ignore-this: 3dc94c06cdfacf20cf000682370fbf3
127]
128[Fixed crash on Windows due to file handle leak.
129Thomas Tuegel <ttuegel@gmail.com>**20110518030422
130 Ignore-this: c94eb903aef9ffcf52394a821d245dda
131 Ticket #843. Cabal test crashed when trying to delete a temporary log file
132 because 'readFile' reads unnecessarily lazily and was keeping a file handle
133 open during attempted deletion. This patch forces the entire file to be read
134 so the handle will be closed.
135]
136[Stop cabal-install from duplicating test options.
137Thomas Tuegel <ttuegel@gmail.com>**20110521232047
138 Ignore-this: 55b98ab47306178e355cacedc7a5a6d2
139]
140[Fix use of multiple test options.
141Thomas Tuegel <ttuegel@gmail.com>**20110521223029
142 Ignore-this: c694ad21faab23abb7157ccec700ccf2
143]
144[Don't prefix test output with ">>>".
145Thomas Tuegel <ttuegel@gmail.com>**20110708035007
146 Ignore-this: a9d417eb836c641339a0203d1c36e82e
147 Ticket #848. Removing the prefix brings "cabal test" in line with other cabal
148 commands, which do not prefix their output, either. Prior to this patch, the
149 summary notices which appear before and after each test suite were written to
150 the temporary log file along with the stdio from the test executable; this would
151 lead to duplicate notices when the contents of the temporary log file are read
152 onto the console. After this patch, the summary notices are never written to the
153 temporary log file, only to the console and the final log file (which is never
154 read by Cabal), removing the confusing duplicate notices.
155]
156[Fail gracefully when running "setup test" before "setup build".
157Thomas Tuegel <ttuegel@gmail.com>**20110303164611
158 Ignore-this: a4d818cd7702ddbbbbffc8679abeb85d
159]
160[Bump cabal-install version
161Duncan Coutts <duncan@community.haskell.org>**20110708013248
162 Ignore-this: 16626faad564787fc5ae3808d1e6ccc9
163]
164[Bump Cabal lib version
165Duncan Coutts <duncan@community.haskell.org>**20110708013245
166 Ignore-this: e01c7efbb68856167c227ba118ddce33
167]
168[Couple of trivial code changes
169Duncan Coutts <duncan@community.haskell.org>**20110708013012
170 Ignore-this: b98aaac9e33f8c684cefedcd05d37ee2
171]
172[Fix withComponentsLBI and move Components to LocalBuildInfo module
173Duncan Coutts <duncan@community.haskell.org>**20110708012122
174 Ignore-this: 57217119f7825c9bcd3824a34ecd0c8f
175 An annoyance of the current Simple build system is that each phase
176 (build, install, etc) can be passed additional HookedBuildInfo which
177 gets merged into the PackageDescription. This means that we cannot
178 process the PackageDescription up front at configure time and just
179 store and reuse it later, we have to work from it each time afresh.
180 
181 The recent addition of Components (libs, exes, test suites) and a
182 topoligical sort of the components in the LocalBuildInfo fell foul
183 of this annoyance. The LocalBuildInfo stored the entire component
184 which meant they were not updated with the HookedBuildInfo. This
185 broke packages with custom Setup.hs scripts that took advantage of
186 the HookedBuildInfo feature, including those with configure scripts.
187 
188 The solution is to store not the list of whole components but the
189 list of component names. Then withComponentsLBI retrieves the actual
190 components from the PackageDescription which thus includes the
191 HookedBuildInfo.
192 
193 Also moved the Components into an internal module because (for the
194 moment at least) it is part of the Simple build system, not part of
195 the package description.
196]
197[Relax some dependencies
198Ian Lynagh <igloo@earth.li>**20110706192619
199 Ignore-this: 6353c1d64a2fff3cef3ca0d8a9f2e95e
200]
201[Add files needed by the GHC build system
202Ian Lynagh <igloo@earth.li>**20110624003654
203 Ignore-this: a40dd98104e994d1a1648c3ce2676a45
204]
205[Add a dash separator for pid in createTempDirectory and openBinaryTempFile too
206Jens Petersen <juhp@community.haskell.org>**20110519021658
207 Ignore-this: ee0c842388212326579309ac6f93408f
208]
209[Update changelog for 1.10.2.0
210Duncan Coutts <duncan@community.haskell.org>**20110618190748
211 Ignore-this: 64129f45dd16d2d93c82097530dc15d1
212]
213[TAG cabal-install merged
214Duncan Coutts <duncan@community.haskell.org>**20110619135228
215 Ignore-this: 58d670de46a24046d0b869dc2b88e13a
216 We now have both the Cabal library and the cabal-install tool
217 together in the same repo, each in a subdir.
218     
219 The idea is that this will make splitting packages and moving
220 code between package rather easier in future.
221]
222Patch bundle hash:
2234f8707a4a87cb1ce03899d6356fa8341331f4a03