--- ray/test/util/Makefile	2020/07/17 23:02:10	1.7
+++ ray/test/util/Makefile	2022/03/21 01:17:18	1.11
@@ -1,14 +1,14 @@
-# RCSid $Id: Makefile,v 1.7 2020/07/17 23:02:10 greg Exp $
+# RCSid $Id: Makefile,v 1.11 2022/03/21 01:17:18 greg Exp $
 #
 # Unit tests for tools built in src/util but not covered by test/renders
 #
 
 all:	test-vwright test-getinfo test-rcollate test-rmtxop test-dctimestep \
 test-genskyvec test-vwrays test-glarendx test-rcode_norm test-rcode_depth \
-test-rcode_ident test-wrapBSDF test-rttree_reduce
+test-rcode_ident test-wrapBSDF test-rttree_reduce test-rcrop
 
 clean:
-	rm -f test.mtx ttree.txt vwrays.txt
+	rm -f test.mtx cropped.mtx ttree.txt vwrays.txt
 
 test-vwright:	test.vf
 	vwright -vf test.vf 3.5 > vwright.txt
@@ -61,7 +61,7 @@ test-wrapBSDF:	ttree.txt
 	rm -f testBSDF.xml
 
 test.mtx:	../renders/ref/rfmirror.mtx
-	rcollate -t ../renders/ref/rfmirror.mtx > test.mtx
+	rcollate -c -t ../renders/ref/rfmirror.mtx > test.mtx
 
 ttree.txt:
 	cnt 256 | rcalc -e '$$1=floor(sin(PI/256*recno)*40)' \
@@ -75,7 +75,12 @@ test-genskyvec:	test-dctimestep
 
 test-dctimestep:	test.mtx
 	gensky 3 21 10:15PST +s -g .3 -g 2.5 -a 36 -o 124 \
-		| perl ../../src/util/genskyvec.pl -m 1 -c .92 1.03 1.2 \
+		| genskyvec -m 1 -c .92 1.03 1.2 \
 		| dctimestep '!rmtxop -ff -t test.mtx' > dctimestep.mtx
 	radcompare ref/dctimestep.mtx dctimestep.mtx
 	rm -f dctimestep.mtx
+
+test-rcrop:	test.mtx
+	rcrop 15 31 75 19 test.mtx > cropped.mtx
+	radcompare ref/cropped.mtx cropped.mtx
+	rm -f cropped.mtx