ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/test/renders/Makefile
(Generate patch)

Comparing ray/test/renders/Makefile (file contents):
Revision 1.1 by greg, Sat Nov 17 22:09:12 2018 UTC vs.
Revision 1.40 by greg, Tue Mar 12 15:49:18 2024 UTC

# Line 3 | Line 3
3   # Render and primitive type testing
4   #
5  
6 + # Number of processes to use on tests that run multi-core
7 + ifeq ($(OS),Windows_NT)  # is Windows
8 +        NPROC := 1
9 + else
10 +        NPROC := 2
11 + endif
12 +
13   # Image reduction for comparisons
14   RDU_PFILT = pfilt -1 -r 1 -x 128 -y 128 -pa 1
15  
16   # Image comparison command
17 < IMG_CMP = radcompare -rms 0.08 -max 1.5
17 > IMG_CMP = radcompare -rel 0.007 -rms 0.1 -max 1.5
18  
19   # Default target is to test everything
20 < all:    test-dielectric-def test-dielectric-fish test-glass-def \
21 < test-glass-fish test-glass-up test-inst-def test-inst-fish \
22 < test-mesh-def test-mesh-cyl test-mirror-fish test-mist-def \
23 < test-tfunc-def test-tfunc-fish test-trans-def test-trans-fish \
24 < test-trans2-def test-trans2-fish
20 > all:    test-xform test-oconv test-rad test-rfluxmtx test-rpiece \
21 > test-rpict test-mkpmap \
22 > test-trans2-def test-trans2-fish test-trans2-win \
23 > test-mixtex-def test-mixtex-fish test-mixtex-plan test-mixtex-rplan \
24 > test-tfunc-def test-tfunc-fish test-inst-def test-inst-fish \
25 > test-mesh-def test-mesh-cyl test-mesh-cyl2 test-mist-def \
26 > test-dielectric-def test-dielectric-fish test-trans-def \
27 > test-glass-def test-glass-fish test-glass-up \
28 > test-trans-fish test-patterns-def test-patterns-plan \
29 > test-rtrace test-mirror-fish test-obj2mesh \
30 > test-prism1-fish test-prism2-fish test-spectra-fish
31  
32   clean:
33 <        rm -f *.oct *.amb *.dat *_*.hdr
33 >        rm -f *.oct *.amb *_ill.dat blinds_ill?.dat *_*.hdr *.unf \
34 > *.[cg]pm{,.leaf} inst_rad.txt combined.rad rfmirror.mtx
35  
36 < ### Reference and test for dielectric view def ###
36 > ######
37 > # More-or-less evenly divided batches for NPROC=1 (redundancies removed)
38  
39 < test-dielectric-def:    ref/dielectric_def.hdr dielectric_def.hdr
39 > batch1: test-mixtex-def test-mixtex-fish test-mixtex-plan test-mixtex-rplan \
40 > test-xform test-oconv test-rad test-obj2mesh
41 >
42 > batch2: test-rfluxmtx test-mist-def test-glass-def test-glass-fish test-glass-up \
43 > test-spectra-fish
44 >
45 > batch3: test-inst-def test-inst-fish test-trans2-def test-trans2-fish test-trans2-win \
46 > test-dielectric-def test-dielectric-fish
47 >
48 > batch4: test-rtrace test-prism1-fish test-prism2-fish test-mirror-fish \
49 > test-mesh-def test-mesh-cyl test-mesh-cyl2 test-tfunc-def test-tfunc-fish \
50 > test-trans-def test-trans-fish test-patterns-def test-patterns-plan
51 >
52 > ### Test Aliases ###
53 >
54 > test-rpict:     test-mirror-fish
55 >
56 > test-rpiece test-mkpmap:        test-mixtex-def
57 >
58 > ### Special test of xform ###
59 >
60 > test-xform:     combined.rad
61 >        radcompare "-c#" -max 0.04 ref/combined.rad combined.rad
62 >
63 > combined.rad:   combined_scene.rad
64 >        xform -f combined_scene.rad > combined.rad
65 >
66 > ### Special test of rad ###
67 >
68 > test-rad:       inst.oct
69 >        rad -n -s -e inst.rif > inst_rad.txt
70 >        radcompare ref/inst_rad.txt inst_rad.txt
71 >
72 > ### Special tests of oconv and obj2mesh ###
73 >
74 > test-oconv:     inst.oct
75 >        radcompare ref/inst.oct inst.oct
76 >
77 > test-obj2mesh:  cab.obj
78 >        obj2mesh -w cab.obj | radcompare ref/cab.rtm -
79 >
80 > ### Special test of rtrace ###
81 >
82 > test-rtrace:    rtmirror_fish.hdr
83 >        $(RDU_PFILT) rtmirror_fish.hdr | $(IMG_CMP) -h ref/mirror_fish.hdr -
84 >
85 > rtmirror_fish.hdr:      mirror.oct
86 >        rad -v 0 mirror.rif OPT=mirror.opt
87 >        vwrays -ff -vf fish.vf -x 2048 -y 1991 | rtrace -n $(NPROC) @mirror.opt \
88 > -ffc -x 2048 -y 1991 mirror.oct | pfilt -1 -e +3 -r .6 -x /2 -y /2 \
89 > > rtmirror_fish.hdr
90 >        rm -f mirror.opt
91 >
92 > ### Special test for rfluxmtx (and rcontrib) ###
93 >
94 > test-rfluxmtx:  rfmirror.mtx
95 >        radcompare -max .4 -rms .05 -rel 1e-4 ref/rfmirror.mtx rfmirror.mtx
96 >
97 > rfmirror.mtx:   mirror.rad dummysky.rad basic.mat diorama_walls.rad \
98 > closed_end.rad front_cap.rad glass_pane.rad antimatter_portal.rad
99 >        rfluxmtx -n $(NPROC) -ab 2 -lw 1e-4 mirror.rad dummysky.rad \
100 > basic.mat diorama_walls.rad closed_end.rad front_cap.rad \
101 > glass_pane.rad antimatter_portal.rad > rfmirror.mtx
102 >
103 > ### Octree for dielectric ###
104 >
105 > dielectric.oct: dielectric.rif
106 >        rad -v 0 dielectric.rif
107 >
108 > ### Reference and test for dielectric view   def ###
109 >
110 > test-dielectric-def:    dielectric_def.hdr
111          $(RDU_PFILT) dielectric_def.hdr | $(IMG_CMP) ref/dielectric_def.hdr -
112  
113 < ref/dielectric_def.hdr:
28 <        make dielectric_def.hdr
113 > ref/dielectric_def.hdr: dielectric_def.hdr
114          $(RDU_PFILT) dielectric_def.hdr > ref/dielectric_def.hdr
115  
116 < dielectric_def.hdr:     dielectric.rif
117 <        rad -v def dielectric.rif
116 > dielectric_def.hdr:     dielectric.oct
117 >        rad -v   def dielectric.rif
118  
119 < ### End dielectric-def tests
119 > ### End dielectric-def   tests
120  
121 < ### Reference and test for dielectric view fish ###
121 > ### Reference and test for dielectric view  fish ###
122  
123 < test-dielectric-fish:   ref/dielectric_fish.hdr dielectric_fish.hdr
123 > test-dielectric-fish:   dielectric_fish.hdr
124          $(RDU_PFILT) dielectric_fish.hdr | $(IMG_CMP) ref/dielectric_fish.hdr -
125  
126 < ref/dielectric_fish.hdr:
42 <        make dielectric_fish.hdr
126 > ref/dielectric_fish.hdr:        dielectric_fish.hdr
127          $(RDU_PFILT) dielectric_fish.hdr > ref/dielectric_fish.hdr
128  
129 < dielectric_fish.hdr:    dielectric.rif
130 <        rad -v fish dielectric.rif
129 > dielectric_fish.hdr:    dielectric.oct
130 >        rad -v  fish dielectric.rif
131  
132 < ### End dielectric-fish tests
132 > ### End dielectric-fish  tests
133  
134 < ### Reference and test for glass view def ###
134 > ### Octree for   glass ###
135  
136 < test-glass-def: ref/glass_def.hdr glass_def.hdr
137 <        $(RDU_PFILT) glass_def.hdr | $(IMG_CMP) ref/glass_def.hdr -
136 > glass.oct:      glass.rif
137 >        rad -v 0   glass.rif
138  
139 < ref/glass_def.hdr:
56 <        make -s glass_def.hdr
57 <        $(RDU_PFILT) glass_def.hdr > ref/glass_def.hdr
139 > ### Reference and test for   glass view   def ###
140  
141 < glass_def.hdr:  glass.rif
142 <        rad -v def glass.rif
141 > test-glass-def:         glass_def.hdr
142 >        $(RDU_PFILT)   glass_def.hdr | $(IMG_CMP) ref/glass_def.hdr -
143  
144 < ### End glass-def tests
144 > ref/glass_def.hdr:      glass_def.hdr
145 >        $(RDU_PFILT)   glass_def.hdr > ref/glass_def.hdr
146  
147 < ### Reference and test for glass view fish ###
147 > glass_def.hdr:  glass.oct
148 >        rad -v   def   glass.rif
149  
150 < test-glass-fish:        ref/glass_fish.hdr glass_fish.hdr
67 <        $(RDU_PFILT) glass_fish.hdr | $(IMG_CMP) ref/glass_fish.hdr -
150 > ### End   glass-def   tests
151  
152 < ref/glass_fish.hdr:
70 <        make -s glass_fish.hdr
71 <        $(RDU_PFILT) glass_fish.hdr > ref/glass_fish.hdr
152 > ### Reference and test for   glass view  fish ###
153  
154 < glass_fish.hdr: glass.rif
155 <        rad -v fish glass.rif
154 > test-glass-fish:        glass_fish.hdr
155 >        $(RDU_PFILT)   glass_fish.hdr | $(IMG_CMP) ref/glass_fish.hdr -
156  
157 < ### End glass-fish tests
157 > ref/glass_fish.hdr:     glass_fish.hdr
158 >        $(RDU_PFILT)   glass_fish.hdr > ref/glass_fish.hdr
159  
160 < ### Reference and test for glass view up ###
160 > glass_fish.hdr: glass.oct
161 >        rad -v  fish   glass.rif
162  
163 < test-glass-up:  ref/glass_up.hdr glass_up.hdr
81 <        $(RDU_PFILT) glass_up.hdr | $(IMG_CMP) ref/glass_up.hdr -
163 > ### End   glass-fish  tests
164  
165 < ref/glass_up.hdr:
84 <        make -s glass_up.hdr
85 <        $(RDU_PFILT) glass_up.hdr > ref/glass_up.hdr
165 > ### Reference and test for   glass view    up ###
166  
167 < glass_up.hdr:   glass.rif
168 <        rad -v up glass.rif
167 > test-glass-up:  glass_up.hdr
168 >        $(RDU_PFILT)   glass_up.hdr | $(IMG_CMP) ref/glass_up.hdr -
169  
170 < ### End glass-up tests
170 > ref/glass_up.hdr:       glass_up.hdr
171 >        $(RDU_PFILT)   glass_up.hdr > ref/glass_up.hdr
172  
173 < ### Reference and test for inst view def ###
173 > glass_up.hdr:   glass.oct
174 >        rad -v    up   glass.rif
175  
176 < test-inst-def:  ref/inst_def.hdr inst_def.hdr
95 <        $(RDU_PFILT) inst_def.hdr | $(IMG_CMP) ref/inst_def.hdr -
176 > ### End   glass-up    tests
177  
178 < ref/inst_def.hdr:
98 <        make -s inst_def.hdr
99 <        $(RDU_PFILT) inst_def.hdr > ref/inst_def.hdr
178 > ### Octree for    inst ###
179  
180 < inst_def.hdr:   inst.rif
181 <        rad -v def inst.rif
180 > inst.oct:       inst.rif
181 >        rad -v 0    inst.rif
182  
183 < ### End inst-def tests
183 > ### Reference and test for    inst view   def ###
184  
185 < ### Reference and test for inst view fish ###
185 > test-inst-def:  inst_def.hdr
186 >        $(RDU_PFILT)    inst_def.hdr | $(IMG_CMP) ref/inst_def.hdr -
187  
188 < test-inst-fish: ref/inst_fish.hdr inst_fish.hdr
189 <        $(RDU_PFILT) inst_fish.hdr | $(IMG_CMP) ref/inst_fish.hdr -
188 > ref/inst_def.hdr:       inst_def.hdr
189 >        $(RDU_PFILT)    inst_def.hdr > ref/inst_def.hdr
190  
191 < ref/inst_fish.hdr:
192 <        make -s inst_fish.hdr
113 <        $(RDU_PFILT) inst_fish.hdr > ref/inst_fish.hdr
191 > inst_def.hdr:   inst.oct
192 >        rad -v   def    inst.rif
193  
194 < inst_fish.hdr:  inst.rif
116 <        rad -v fish inst.rif
194 > ### End    inst-def   tests
195  
196 < ### End inst-fish tests
196 > ### Reference and test for    inst view  fish ###
197  
198 < ### Reference and test for mesh view def ###
198 > test-inst-fish: inst_fish.hdr
199 >        $(RDU_PFILT)    inst_fish.hdr | $(IMG_CMP) ref/inst_fish.hdr -
200  
201 < test-mesh-def:  ref/mesh_def.hdr mesh_def.hdr
202 <        $(RDU_PFILT) mesh_def.hdr | $(IMG_CMP) ref/mesh_def.hdr -
201 > ref/inst_fish.hdr:      inst_fish.hdr
202 >        $(RDU_PFILT)    inst_fish.hdr > ref/inst_fish.hdr
203  
204 < ref/mesh_def.hdr:
205 <        make -s mesh_def.hdr
127 <        $(RDU_PFILT) mesh_def.hdr > ref/mesh_def.hdr
204 > inst_fish.hdr:  inst.oct
205 >        rad -v  fish    inst.rif
206  
207 < mesh_def.hdr:   mesh.rif
130 <        rad -v def mesh.rif
207 > ### End    inst-fish  tests
208  
209 < ### End mesh-def tests
209 > ### Octree for    mesh ###
210  
211 < ### Reference and test for mesh view cyl ###
211 > mesh.oct:       mesh.rif
212 >        rad -v 0    mesh.rif
213  
214 < test-mesh-cyl:  ref/mesh_cyl.hdr mesh_cyl.hdr
137 <        $(RDU_PFILT) mesh_cyl.hdr | $(IMG_CMP) ref/mesh_cyl.hdr -
214 > ### Reference and test for    mesh view   def ###
215  
216 < ref/mesh_cyl.hdr:
217 <        make -s mesh_cyl.hdr
141 <        $(RDU_PFILT) mesh_cyl.hdr > ref/mesh_cyl.hdr
216 > test-mesh-def:  mesh_def.hdr
217 >        $(RDU_PFILT)    mesh_def.hdr | $(IMG_CMP) ref/mesh_def.hdr -
218  
219 < mesh_cyl.hdr:   mesh.rif
220 <        rad -v cyl mesh.rif
219 > ref/mesh_def.hdr:       mesh_def.hdr
220 >        $(RDU_PFILT)    mesh_def.hdr > ref/mesh_def.hdr
221  
222 < ### End mesh-cyl tests
222 > mesh_def.hdr:   mesh.oct
223 >        rad -v   def    mesh.rif
224  
225 < ### Reference and test for mesh view cyl2 ###
225 > ### End    mesh-def   tests
226  
227 < test-mesh-cyl2: ref/mesh_cyl2.hdr mesh_cyl2.hdr
151 <        $(RDU_PFILT) mesh_cyl2.hdr | $(IMG_CMP) ref/mesh_cyl2.hdr -
227 > ### Reference and test for    mesh view   cyl ###
228  
229 < ref/mesh_cyl2.hdr:
230 <        make -s mesh_cyl2.hdr
155 <        $(RDU_PFILT) mesh_cyl2.hdr > ref/mesh_cyl2.hdr
229 > test-mesh-cyl:  mesh_cyl.hdr
230 >        $(RDU_PFILT)    mesh_cyl.hdr | $(IMG_CMP) ref/mesh_cyl.hdr -
231  
232 < mesh_cyl2.hdr:  mesh.rif
233 <        rad -v cyl2 mesh.rif
232 > ref/mesh_cyl.hdr:       mesh_cyl.hdr
233 >        $(RDU_PFILT)    mesh_cyl.hdr > ref/mesh_cyl.hdr
234  
235 < ### End mesh-cyl2 tests
235 > mesh_cyl.hdr:   mesh.oct
236 >        rad -v   cyl    mesh.rif
237  
238 < ### Reference and test for mirror view fish ###
238 > ### End    mesh-cyl   tests
239  
240 < test-mirror-fish:       ref/mirror_fish.hdr mirror_fish.hdr
165 <        $(RDU_PFILT) mirror_fish.hdr | $(IMG_CMP) ref/mirror_fish.hdr -
240 > ### Reference and test for    mesh view  cyl2 ###
241  
242 < ref/mirror_fish.hdr:
243 <        make -s mirror_fish.hdr
169 <        $(RDU_PFILT) mirror_fish.hdr > ref/mirror_fish.hdr
242 > test-mesh-cyl2:         mesh_cyl2.hdr
243 >        $(RDU_PFILT)    mesh_cyl2.hdr | $(IMG_CMP) ref/mesh_cyl2.hdr -
244  
245 < mirror_fish.hdr:        mirror.rif
246 <        rad -v fish mirror.rif
245 > ref/mesh_cyl2.hdr:      mesh_cyl2.hdr
246 >        $(RDU_PFILT)    mesh_cyl2.hdr > ref/mesh_cyl2.hdr
247  
248 < ### End mirror-fish tests
248 > mesh_cyl2.hdr:  mesh.oct
249 >        rad -v  cyl2    mesh.rif
250  
251 < ### Reference and test for mist view def ###
251 > ### End    mesh-cyl2  tests
252  
253 < test-mist-def:  ref/mist_def.hdr mist_def.hdr
179 <        $(RDU_PFILT) mist_def.hdr | $(IMG_CMP) ref/mist_def.hdr -
253 > ### Octree for  mirror ###
254  
255 < ref/mist_def.hdr:
256 <        make -s mist_def.hdr
183 <        $(RDU_PFILT) mist_def.hdr > ref/mist_def.hdr
255 > mirror.oct:     mirror.rif
256 >        rad -v 0  mirror.rif
257  
258 + ### Reference and test for  mirror view  fish ###
259 +
260 + test-mirror-fish:       mirror_fish.hdr
261 +        $(RDU_PFILT)  mirror_fish.hdr | $(IMG_CMP) ref/mirror_fish.hdr -
262 +
263 + ref/mirror_fish.hdr:    mirror_fish.hdr
264 +        $(RDU_PFILT)  mirror_fish.hdr > ref/mirror_fish.hdr
265 +
266 + mirror_fish.hdr:        mirror.oct
267 +        rad -v  fish  mirror.rif
268 +
269 + ### End  mirror-fish  tests
270 +
271 + ### Reference and test for    mist view   def ###
272 +
273 + test-mist-def:  mist_def.hdr
274 +        $(RDU_PFILT)    mist_def.hdr | $(IMG_CMP) ref/mist_def.hdr -
275 +
276 + ref/mist_def.hdr:       mist_def.hdr
277 +        $(RDU_PFILT)    mist_def.hdr > ref/mist_def.hdr
278 +
279   mist_def.hdr:   mist.rif
280 <        rad -v def mist.rif
280 >        rad -N $(NPROC) mist.rif
281  
282 < ### End mist-def tests
282 > ### End    mist-def   tests
283  
284 < ### Reference and test for prism1 view fish ###
284 > ### Octree for  prism1 ###
285  
286 < test-prism1-fish:       ref/prism1_fish.hdr prism1_fish.hdr
287 <        $(RDU_PFILT) prism1_fish.hdr | $(IMG_CMP) ref/prism1_fish.hdr -
286 > prism1.oct:     prism1.rif
287 >        rad -v 0  prism1.rif
288  
289 < ref/prism1_fish.hdr:
196 <        make -s prism1_fish.hdr
197 <        $(RDU_PFILT) prism1_fish.hdr > ref/prism1_fish.hdr
289 > ### Reference and test for  prism1 view  fish ###
290  
291 < prism1_fish.hdr:        prism1.rif
292 <        rad -v fish prism1.rif
291 > test-prism1-fish:       prism1_fish.hdr
292 >        $(RDU_PFILT)  prism1_fish.hdr | $(IMG_CMP) ref/prism1_fish.hdr -
293  
294 < ### End prism1-fish tests
294 > ref/prism1_fish.hdr:    prism1_fish.hdr
295 >        $(RDU_PFILT)  prism1_fish.hdr > ref/prism1_fish.hdr
296  
297 < ### Reference and test for prism2 view fish ###
297 > prism1_fish.hdr:        prism1.oct
298 >        rad -v  fish  prism1.rif
299  
300 < test-prism2-fish:       ref/prism2_fish.hdr prism2_fish.hdr
207 <        $(RDU_PFILT) prism2_fish.hdr | $(IMG_CMP) ref/prism2_fish.hdr -
300 > ### End  prism1-fish  tests
301  
302 < ref/prism2_fish.hdr:
210 <        make -s prism2_fish.hdr
211 <        $(RDU_PFILT) prism2_fish.hdr > ref/prism2_fish.hdr
302 > ### Octree for  prism2 ###
303  
304 < prism2_fish.hdr:        prism2.rif
305 <        rad -v fish prism2.rif
304 > prism2.oct:     prism2.rif
305 >        rad -v 0  prism2.rif
306  
307 < ### End prism2-fish tests
307 > ### Reference and test for  prism2 view  fish ###
308  
309 < ### Reference and test for tfunc view def ###
309 > test-prism2-fish:       prism2_fish.hdr
310 >        $(RDU_PFILT)  prism2_fish.hdr | $(IMG_CMP) ref/prism2_fish.hdr -
311  
312 < test-tfunc-def: ref/tfunc_def.hdr tfunc_def.hdr
313 <        $(RDU_PFILT) tfunc_def.hdr | $(IMG_CMP) ref/tfunc_def.hdr -
312 > ref/prism2_fish.hdr:    prism2_fish.hdr
313 >        $(RDU_PFILT)  prism2_fish.hdr > ref/prism2_fish.hdr
314  
315 < ref/tfunc_def.hdr:
316 <        make -s tfunc_def.hdr
225 <        $(RDU_PFILT) tfunc_def.hdr > ref/tfunc_def.hdr
315 > prism2_fish.hdr:        prism2.oct
316 >        rad -v  fish  prism2.rif
317  
318 < tfunc_def.hdr:  tfunc.rif
228 <        rad -v def tfunc.rif
318 > ### End  prism2-fish  tests
319  
320 < ### End tfunc-def tests
320 > ### Octree for   tfunc ###
321  
322 < ### Reference and test for tfunc view fish ###
322 > tfunc1.oct:     tfunc.rif
323 >        rad -v 0   tfunc.rif
324  
325 < test-tfunc-fish:        ref/tfunc_fish.hdr tfunc_fish.hdr
235 <        $(RDU_PFILT) tfunc_fish.hdr | $(IMG_CMP) ref/tfunc_fish.hdr -
325 > ### Reference and test for   tfunc view   def ###
326  
327 < ref/tfunc_fish.hdr:
328 <        make -s tfunc_fish.hdr
239 <        $(RDU_PFILT) tfunc_fish.hdr > ref/tfunc_fish.hdr
327 > test-tfunc-def:         tfunc_def.hdr
328 >        $(RDU_PFILT)   tfunc_def.hdr | $(IMG_CMP) ref/tfunc_def.hdr -
329  
330 < tfunc_fish.hdr: tfunc.rif
331 <        rad -v fish tfunc.rif
330 > ref/tfunc_def.hdr:      tfunc_def.hdr
331 >        $(RDU_PFILT)   tfunc_def.hdr > ref/tfunc_def.hdr
332  
333 < ### End tfunc-fish tests
333 > tfunc_def.hdr:  tfunc1.oct
334 >        rad -v   def   tfunc.rif
335  
336 < ### Reference and test for trans view def ###
336 > ### End   tfunc-def   tests
337  
338 < test-trans-def: ref/trans_def.hdr trans_def.hdr
249 <        $(RDU_PFILT) trans_def.hdr | $(IMG_CMP) ref/trans_def.hdr -
338 > ### Reference and test for   tfunc view  fish ###
339  
340 < ref/trans_def.hdr:
341 <        make -s trans_def.hdr
253 <        $(RDU_PFILT) trans_def.hdr > ref/trans_def.hdr
340 > test-tfunc-fish:        tfunc_fish.hdr
341 >        $(RDU_PFILT)   tfunc_fish.hdr | $(IMG_CMP) ref/tfunc_fish.hdr -
342  
343 < trans_def.hdr:  trans.rif
344 <        rad -v def trans.rif
343 > ref/tfunc_fish.hdr:     tfunc_fish.hdr
344 >        $(RDU_PFILT)   tfunc_fish.hdr > ref/tfunc_fish.hdr
345  
346 < ### End trans-def tests
346 > tfunc_fish.hdr: tfunc1.oct
347 >        rad -v  fish   tfunc.rif
348  
349 < ### Reference and test for trans view fish ###
349 > ### End   tfunc-fish  tests
350  
351 < test-trans-fish:        ref/trans_fish.hdr trans_fish.hdr
263 <        $(RDU_PFILT) trans_fish.hdr | $(IMG_CMP) ref/trans_fish.hdr -
351 > ### Octree for   trans ###
352  
353 < ref/trans_fish.hdr:
354 <        make -s trans_fish.hdr
267 <        $(RDU_PFILT) trans_fish.hdr > ref/trans_fish.hdr
353 > trans.oct:      trans.rif
354 >        rad -v 0   trans.rif
355  
356 < trans_fish.hdr: trans.rif
270 <        rad -v fish trans.rif
356 > ### Reference and test for   trans view   def ###
357  
358 < ### End trans-fish tests
358 > test-trans-def:         trans_def.hdr
359 >        $(RDU_PFILT)   trans_def.hdr | $(IMG_CMP) ref/trans_def.hdr -
360  
361 < ### Reference and test for trans2 view def ###
361 > ref/trans_def.hdr:       trans_def.hdr
362 >        $(RDU_PFILT)   trans_def.hdr > ref/trans_def.hdr
363  
364 < test-trans2-def:        ref/trans2_def.hdr trans2_def.hdr
365 <        $(RDU_PFILT) trans2_def.hdr | $(IMG_CMP) ref/trans2_def.hdr -
364 > trans_def.hdr:  trans.oct
365 >        rad -v   def   trans.rif
366  
367 < ref/trans2_def.hdr:
280 <        make -s trans2_def.hdr
281 <        $(RDU_PFILT) trans2_def.hdr > ref/trans2_def.hdr
367 > ### End   trans-def   tests
368  
369 < trans2_def.hdr: trans2.rif
284 <        rad -v def trans2.rif
369 > ### Reference and test for   trans view  fish ###
370  
371 < ### End trans2-def tests
371 > test-trans-fish:        trans_fish.hdr
372 >        $(RDU_PFILT)   trans_fish.hdr | $(IMG_CMP) ref/trans_fish.hdr -
373  
374 < ### Reference and test for trans2 view fish ###
374 > ref/trans_fish.hdr:     trans_fish.hdr
375 >        $(RDU_PFILT)   trans_fish.hdr > ref/trans_fish.hdr
376  
377 < test-trans2-fish:       ref/trans2_fish.hdr trans2_fish.hdr
378 <        $(RDU_PFILT) trans2_fish.hdr | $(IMG_CMP) ref/trans2_fish.hdr -
377 > trans_fish.hdr: trans.oct
378 >        rad -v  fish   trans.rif
379  
380 < ref/trans2_fish.hdr:
294 <        make -s trans2_fish.hdr
295 <        $(RDU_PFILT) trans2_fish.hdr > ref/trans2_fish.hdr
380 > ### End   trans-fish  tests
381  
382 < trans2_fish.hdr:        trans2.rif
298 <        rad -v fish trans2.rif
382 > ### Octree for  trans2 ###
383  
384 < ### End trans2-fish tests
384 > trans21.oct:    trans2.rif
385 >        rad -v 0  trans2.rif
386  
387 < ### Reference and test for trans2 view win ###
387 > ### Reference and test for  trans2 view   def ###
388  
389 < test-trans2-win:        ref/trans2_win.hdr trans2_win.hdr
390 <        $(RDU_PFILT) trans2_win.hdr | $(IMG_CMP) ref/trans2_win.hdr -
389 > test-trans2-def:        trans2_def.hdr
390 >        $(RDU_PFILT)  trans2_def.hdr | $(IMG_CMP) ref/trans2_def.hdr -
391  
392 < ref/trans2_win.hdr:
393 <        make -s trans2_win.hdr
309 <        $(RDU_PFILT) trans2_win.hdr > ref/trans2_win.hdr
392 > ref/trans2_def.hdr:     trans2_def.hdr
393 >        $(RDU_PFILT)  trans2_def.hdr > ref/trans2_def.hdr
394  
395 < trans2_win.hdr: trans2.rif
396 <        rad -v win trans2.rif
395 > trans2_def.hdr: trans21.oct
396 >        rad -v   def  trans2.rif
397  
398 < ### End trans2-win tests
398 > ### End  trans2-def   tests
399 >
400 > ### Reference and test for  trans2 view  fish ###
401 >
402 > test-trans2-fish:       trans2_fish.hdr
403 >        $(RDU_PFILT)  trans2_fish.hdr | $(IMG_CMP) ref/trans2_fish.hdr -
404 >
405 > ref/trans2_fish.hdr:    trans2_fish.hdr
406 >        $(RDU_PFILT)  trans2_fish.hdr > ref/trans2_fish.hdr
407 >
408 > trans2_fish.hdr:        trans21.oct
409 >        rad -v  fish  trans2.rif
410 >
411 > ### End  trans2-fish  tests
412 >
413 > ### Reference and test for  trans2 view   win ###
414 >
415 > test-trans2-win:        trans2_win.hdr
416 >        $(RDU_PFILT)  trans2_win.hdr | $(IMG_CMP) ref/trans2_win.hdr -
417 >
418 > ref/trans2_win.hdr:     trans2_win.hdr
419 >        $(RDU_PFILT)  trans2_win.hdr > ref/trans2_win.hdr
420 >
421 > trans2_win.hdr: trans21.oct
422 >        rad -v   win  trans2.rif
423 >
424 > ### End  trans2-win   tests
425 >
426 > ### Octree for patterns ###
427 >
428 > patterns.oct:   patterns.rif
429 >        rad -v 0 patterns.rif
430 >
431 > ### Reference and test for patterns view   def ###
432 >
433 > test-patterns-def:      patterns_def.hdr
434 >        $(RDU_PFILT) patterns_def.hdr | $(IMG_CMP) ref/patterns_def.hdr -
435 >
436 > ref/patterns_def.hdr:   patterns_def.hdr
437 >        $(RDU_PFILT) patterns_def.hdr > ref/patterns_def.hdr
438 >
439 > patterns_def.hdr:       patterns.oct
440 >        rad -v   def patterns.rif
441 >
442 > ### End patterns-def   tests
443 >
444 > ### Reference and test for patterns view   plan ###
445 >
446 > test-patterns-plan:     patterns_plan.hdr
447 >        $(RDU_PFILT) patterns_plan.hdr | $(IMG_CMP) ref/patterns_plan.hdr -
448 >
449 > ref/patterns_plan.hdr:  patterns_plan.hdr
450 >        $(RDU_PFILT) patterns_plan.hdr > ref/patterns_plan.hdr
451 >
452 > patterns_plan.hdr:      patterns.oct
453 >        rad -v   plan patterns.rif
454 >
455 > ### End patterns-plan   tests
456 >
457 > ### Octree for  mixtex ###
458 >
459 > mixtex.oct:     mixtex.rif
460 >        rad -v 0 -N $(NPROC) mixtex.rif
461 >
462 > ### Reference and test for  mixtex view   def ###
463 >
464 > test-mixtex-def:        mixtex_def.hdr
465 >        $(RDU_PFILT)  mixtex_def.hdr | $(IMG_CMP) ref/mixtex_def.hdr -
466 >
467 > ref/mixtex_def.hdr:     mixtex_def.hdr
468 >        $(RDU_PFILT)  mixtex_def.hdr > ref/mixtex_def.hdr
469 >
470 > mixtex_def.hdr: mixtex.oct
471 >        rad -v def -N $(NPROC) mixtex.rif
472 >
473 > ### End  mixtex-def   tests
474 >
475 > ### Reference and test for  mixtex view  fish ###
476 >
477 > test-mixtex-fish:       mixtex_fish.hdr
478 >        $(RDU_PFILT)  mixtex_fish.hdr | $(IMG_CMP) ref/mixtex_fish.hdr -
479 >
480 > ref/mixtex_fish.hdr:    mixtex_fish.hdr
481 >        $(RDU_PFILT)  mixtex_fish.hdr > ref/mixtex_fish.hdr
482 >
483 > mixtex_fish.hdr:        mixtex.oct
484 >        rad -v  fish  mixtex.rif
485 >
486 > ### End  mixtex-fish  tests
487 >
488 > ### Reference and test for  mixtex view  plan ###
489 >
490 > test-mixtex-plan:       mixtex_plan.hdr
491 >        $(RDU_PFILT)  mixtex_plan.hdr | $(IMG_CMP) ref/mixtex_plan.hdr -
492 >
493 > ref/mixtex_plan.hdr:    mixtex_plan.hdr
494 >        $(RDU_PFILT)  mixtex_plan.hdr > ref/mixtex_plan.hdr
495 >
496 > mixtex_plan.hdr:        mixtex.oct
497 >        rad -v  plan  mixtex.rif
498 >
499 > ### End  mixtex-plan  tests
500 >
501 > ### Reference and test for  mixtex view rplan ###
502 >
503 > test-mixtex-rplan:      mixtex_rplan.hdr
504 >        $(RDU_PFILT)  mixtex_rplan.hdr | $(IMG_CMP) ref/mixtex_rplan.hdr -
505 >
506 > ref/mixtex_rplan.hdr:   mixtex_rplan.hdr
507 >        $(RDU_PFILT)  mixtex_rplan.hdr > ref/mixtex_rplan.hdr
508 >
509 > mixtex_rplan.hdr:       mixtex.oct
510 >        rad -v rplan  mixtex.rif
511 >
512 > ### End  mixtex-rplan tests
513 >
514 > ### Octree for spectra
515 >
516 > spectra.oct:    spectra.rif
517 >        rad -v 0 spectra.rif
518 >
519 > ### Reference and test for spectra fish ###
520 >
521 > test-spectra-fish:      spectra_fish.hdr
522 >        $(RDU_PFILT) spectra_fish.hdr | $(IMG_CMP) ref/spectra_fish.hdr -
523 >
524 > ref/spectra_fish.hdr:   spectra_fish.hdr
525 >        $(RDU_PFILT) spectra_fish.hdr > ref/spectra_fish.hdr
526 >
527 > spectra_fish.hdr:       spectra.oct
528 >        rad -v fish spectra.rif
529 >
530 > ### End spectra-fish tests

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines