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.17 by greg, Mon Jan 7 21:11:24 2019 UTC vs.
Revision 1.28 by greg, Fri Jan 1 20:15:35 2021 UTC

# Line 3 | Line 3
3   # Render and primitive type testing
4   #
5  
6 < # Number of processes to use on tests that test multi-core
7 < NPROC = 2
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.07 -max 1.5
17 > IMG_CMP = radcompare -rms 0.08 -max 1.5
18  
19   # Default target is to test everything
20 < all:    test-xform test-oconv test-rad test-rfluxmtx \
20 > all:    test-xform test-oconv test-rad test-rfluxmtx test-rpiece \
21 > test-rpict test-mkpmap \
22   test-mixtex-def test-mixtex-fish test-mixtex-plan test-mixtex-rplan \
23   test-trans2-def test-trans2-fish test-dielectric-def \
24   test-dielectric-fish test-glass-def test-glass-fish test-glass-up \
25   test-tfunc-def test-tfunc-fish test-inst-def test-inst-fish \
26   test-mesh-def test-mesh-cyl test-mirror-fish test-mist-def \
27   test-trans-def test-trans-fish test-patterns-def test-patterns-plan \
28 < test-rtrace
28 > test-rtrace test-obj2mesh
29  
30   clean:
31          rm -f *.oct *.amb *_ill.dat blinds_ill?.dat *_*.hdr *.unf \
32   *.[cg]pm{,.leaf} inst_rad.txt combined.rad rfmirror.mtx
33  
34 + ### Test Aliases ###
35 +
36 + test-rpict:     test-mirror-fish
37 +
38 + test-rpiece test-mkpmap:        test-mixtex-def
39 +
40   ### Special test of xform ###
41  
42 < test-xform:     combined_scene.rad
43 <        xform -f combined_scene.rad | grep -v '^[       ]*#' > combined.rad
33 <        radcompare -max 0.04 ref/combined.rad combined.rad
42 > test-xform:     combined.rad
43 >        radcompare "-c#" -max 0.04 ref/combined.rad combined.rad
44  
45 + combined.rad:   combined_scene.rad
46 +        xform -f combined_scene.rad > combined.rad
47 +
48   ### Special test of rad ###
49  
50 < test-rad:       inst.rif
50 > test-rad:       inst.oct
51          rad -n -s -e inst.rif > inst_rad.txt
52          radcompare ref/inst_rad.txt inst_rad.txt
53  
54 < ### Special test of oconv ###
54 > ### Special tests of oconv and obj2mesh ###
55  
56   test-oconv:     inst.oct
57          radcompare ref/inst.oct inst.oct
58  
59 + test-obj2mesh:  cab.obj
60 +        obj2mesh -w cab.obj | radcompare ref/cab.rtm -
61 +
62   ### Special test of rtrace ###
63  
64   test-rtrace:    ref/mirror_fish.hdr  rtmirror_fish.hdr
# Line 58 | Line 74 | rtmirror_fish.hdr:     mirror.oct
74   ### Special test for rfluxmtx (and rcontrib) ###
75  
76   test-rfluxmtx:  ref/rfmirror.mtx rfmirror.mtx
77 <        radcompare -max .4 -rms .05 ref/rfmirror.mtx rfmirror.mtx
77 >        radcompare -max .4 -rms .05 -rel 1e-4 ref/rfmirror.mtx rfmirror.mtx
78  
79   rfmirror.mtx:   mirror.rad dummysky.rad basic.mat diorama_walls.rad \
80   closed_end.rad front_cap.rad glass_pane.rad antimatter_portal.rad
# Line 245 | Line 261 | mirror_fish.hdr:       mirror.oct
261  
262   ### End  mirror-fish  tests
263  
248 ### Octree for    mist ###
249
250 mist.oct:       mist.rif
251        rad -v 0    mist.rif
252
264   ### Reference and test for    mist view   def ###
265  
266   test-mist-def:  ref/mist_def.hdr    mist_def.hdr
# Line 259 | Line 270 | ref/mist_def.hdr:
270          make    mist_def.hdr
271          $(RDU_PFILT)    mist_def.hdr > ref/mist_def.hdr
272  
273 < mist_def.hdr:   mist.oct
274 <        rad -v   def    mist.rif
273 > mist_def.hdr:   mist.rif
274 >        rad -N $(NPROC) mist.rif
275  
276   ### End    mist-def   tests
277  
# Line 304 | Line 315 | prism2_fish.hdr:       prism2.oct
315  
316   ### Octree for   tfunc ###
317  
318 < tfunc.oct:      tfunc.rif
318 > tfunc1.oct:     tfunc.rif
319          rad -v 0   tfunc.rif
320  
321   ### Reference and test for   tfunc view   def ###
# Line 316 | Line 327 | ref/tfunc_def.hdr:
327          make   tfunc_def.hdr
328          $(RDU_PFILT)   tfunc_def.hdr > ref/tfunc_def.hdr
329  
330 < tfunc_def.hdr:  tfunc.oct
330 > tfunc_def.hdr:  tfunc1.oct
331          rad -v   def   tfunc.rif
332  
333   ### End   tfunc-def   tests
# Line 330 | Line 341 | ref/tfunc_fish.hdr:
341          make   tfunc_fish.hdr
342          $(RDU_PFILT)   tfunc_fish.hdr > ref/tfunc_fish.hdr
343  
344 < tfunc_fish.hdr: tfunc.oct
344 > tfunc_fish.hdr: tfunc1.oct
345          rad -v  fish   tfunc.rif
346  
347   ### End   tfunc-fish  tests
# Line 370 | Line 381 | trans_fish.hdr:        trans.oct
381  
382   ### Octree for  trans2 ###
383  
384 < trans2.oct:     trans2.rif
384 > trans21.oct:    trans2.rif
385          rad -v 0  trans2.rif
386  
387   ### Reference and test for  trans2 view   def ###
# Line 382 | Line 393 | ref/trans2_def.hdr:
393          make  trans2_def.hdr
394          $(RDU_PFILT)  trans2_def.hdr > ref/trans2_def.hdr
395  
396 < trans2_def.hdr: trans2.oct
396 > trans2_def.hdr: trans21.oct
397          rad -v   def  trans2.rif
398  
399   ### End  trans2-def   tests
# Line 396 | Line 407 | ref/trans2_fish.hdr:
407          make  trans2_fish.hdr
408          $(RDU_PFILT)  trans2_fish.hdr > ref/trans2_fish.hdr
409  
410 < trans2_fish.hdr:        trans2.oct
410 > trans2_fish.hdr:        trans21.oct
411          rad -v  fish  trans2.rif
412  
413   ### End  trans2-fish  tests
# Line 410 | Line 421 | ref/trans2_win.hdr:
421          make  trans2_win.hdr
422          $(RDU_PFILT)  trans2_win.hdr > ref/trans2_win.hdr
423  
424 < trans2_win.hdr: trans2.oct
424 > trans2_win.hdr: trans21.oct
425          rad -v   win  trans2.rif
426  
427   ### End  trans2-win   tests
# Line 451 | Line 462 | patterns_plan.hdr:     patterns.oct
462   ### Octree for  mixtex ###
463  
464   mixtex.oct:     mixtex.rif
465 <        rad -v 0  mixtex.rif
465 >        rad -v 0 -N $(NPROC) mixtex.rif
466  
467   ### Reference and test for  mixtex view   def ###
468  
# Line 463 | Line 474 | ref/mixtex_def.hdr:
474          $(RDU_PFILT)  mixtex_def.hdr > ref/mixtex_def.hdr
475  
476   mixtex_def.hdr: mixtex.oct
477 <        rad -v   def  mixtex.rif
477 >        rad -v def -N $(NPROC) mixtex.rif
478  
479   ### End  mixtex-def   tests
480  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines