blob: 215f461ff626aa21067261016a705489ff4cc162 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
|
Note that removing --quiet seems to make tests fail, so skip that for now.
--- a/tests/makefile
+++ b/tests/makefile
@@ -5,10 +5,10 @@
# This is what to do by default
test:
- @$(MAKE) --quiet tap | ./tapview
+ $(MAKE) --quiet tap | ./tapview
tap:
- @$(MAKE) --quiet tapstream | tee taplog$$$$; echo "1..$$(grep ok taplog$$$$ | wc -l)"; rm taplog$$$$
+ $(MAKE) --quiet tapstream | tee taplog$$$$; echo "1..$$(grep ok taplog$$$$ | wc -l)"; rm taplog$$$$
tapstream: render-regress \
gif2rgb-regress \
@@ -37,43 +37,43 @@ PICS = ../pic
GIF2RGB = ../gif2rgb
$(GIF2RGB):
- @$(MAKE) -C .. gif2rgb
+ $(MAKE) -C .. gif2rgb
GIFS := $(shell ls ../pic/*.gif)
# Test decompression and rendering by unpacking images,
# converting them to RGB, and comparing that result to a check file.
render-regress: $(GIF2RGB)
- @for test in $(GIFS); \
+ for test in $(GIFS); \
do \
stem=`basename $${test} | sed -e "s/.gif$$//"`; \
$(UTILS)/gif2rgb -1 <$${test} | ./cmpdiffer "gif2rgb: test of $${test}" $${stem}.rgb; \
done
render-rebuild: $(GIF2RGB)
- @for test in $(GIFS); do \
+ for test in $(GIFS); do \
stem=`basename $${test} | sed -e "s/.gif$$//"`; \
echo "Remaking $${stem}.rgb"; \
$(UTILS)/gif2rgb -1 -o $${stem}.rgb $${test}; \
done
gif2rgb-regress: $(GIF2RGB)
- @$(UTILS)/gif2rgb -c 3 -s 100 100 <gifgrid.rgb | $(UTILS)/gifbuild -d | sed "/sort flag/s/off/on/" | ./tapdiffer "checking gif2rgb idempotency" gifgrid.ico
+ $(UTILS)/gif2rgb -c 3 -s 100 100 <gifgrid.rgb | $(UTILS)/gifbuild -d | sed "/sort flag/s/off/on/" | ./tapdiffer "checking gif2rgb idempotency" gifgrid.ico
gif2rgb-rebuild: $(GIF2RGB)
- @echo "Rebuilding gif2rgb checkfile."
- @$(UTILS)/gif2rgb -c 3 -s 100 100 <gifgrid.rgb | $(UTILS)/gifbuild -d >gifgrid.ico
+ echo "Rebuilding gif2rgb checkfile."
+ $(UTILS)/gif2rgb -c 3 -s 100 100 <gifgrid.rgb | $(UTILS)/gifbuild -d >gifgrid.ico
gifbuild-regress:
- @$(UTILS)/gifbuild -d <$(PICS)/treescap.gif | ./tapdiffer "gifbuild: basic sanity check" treescap.ico
- @$(UTILS)/gifbuild <$(PICS)/sample.ico | $(UTILS)/gifbuild -d > $@.sample-1.ico; $(UTILS)/gifbuild < $@.sample-1.ico | $(UTILS)/gifbuild -d > $@.sample-2.ico;
- @./tapdiffer <$@.sample-1.ico "gifbuild: Checking idempotency on an icon file." $@.sample-2.ico; rm $@.sample-?.ico
- @$(UTILS)/gifbuild -d <$(PICS)/fire.gif > $@.fire1.ico
- @$(UTILS)/gifbuild < $@.fire1.ico > $@.fire2.gif
- @$(UTILS)/gifbuild -d < $@.fire2.gif > $@.fire2.ico
- @./tapdiffer <$@.fire1.ico "gifbuild: Checking idempotency on an animation." $@.fire2.ico
- @rm -f $@.fire1.ico $@.fire2.ico $@.fire2.gif
+ $(UTILS)/gifbuild -d <$(PICS)/treescap.gif | ./tapdiffer "gifbuild: basic sanity check" treescap.ico
+ $(UTILS)/gifbuild <$(PICS)/sample.ico | $(UTILS)/gifbuild -d > $@.sample-1.ico; $(UTILS)/gifbuild < $@.sample-1.ico | $(UTILS)/gifbuild -d > $@.sample-2.ico;
+ ./tapdiffer <$@.sample-1.ico "gifbuild: Checking idempotency on an icon file." $@.sample-2.ico; rm $@.sample-?.ico
+ $(UTILS)/gifbuild -d <$(PICS)/fire.gif > $@.fire1.ico
+ $(UTILS)/gifbuild < $@.fire1.ico > $@.fire2.gif
+ $(UTILS)/gifbuild -d < $@.fire2.gif > $@.fire2.ico
+ ./tapdiffer <$@.fire1.ico "gifbuild: Checking idempotency on an animation." $@.fire2.ico
+ rm -f $@.fire1.ico $@.fire2.ico $@.fire2.gif
gifclrmp-regress:
- @for test in $(GIFS); \
+ for test in $(GIFS); \
do \
stem=`basename $${test} | sed -e "s/.gif$$//"`; \
if ! $(UTILS)/gifclrmp <$${test} > $@.$${stem}.regress 2>&1; \
@@ -83,74 +83,74 @@ gifclrmp-regress:
./tapdiffer <$@.$${stem}.regress "gifclrmap: Checking colormap of $${test}" $${stem}.map; \
fi \
done
- @rm -f $@.*.regress
+ rm -f $@.*.regress
gifclrmp-rebuild:
- @for test in $(GIFS); do \
+ for test in $(GIFS); do \
stem=`basename $${test} | sed -e "s/.gif$$//"`; \
echo "Remaking $${stem}.map"; \
$(UTILS)/gifclrmp <$${test} >$${stem}.map; \
done
gifecho-rebuild:
- @echo "Rebuilding gifecho test."
- @$(UTILS)/gifecho -t "foobar" | $(UTILS)/gifbuild -d >foobar.ico
+ echo "Rebuilding gifecho test."
+ $(UTILS)/gifecho -t "foobar" | $(UTILS)/gifbuild -d >foobar.ico
gifecho-regress:
- @$(UTILS)/gifecho -t "foobar" | $(UTILS)/gifbuild -d | ./tapdiffer "gifecho: Testing gifecho behavior" foobar.ico
+ $(UTILS)/gifecho -t "foobar" | $(UTILS)/gifbuild -d | ./tapdiffer "gifecho: Testing gifecho behavior" foobar.ico
giffilter-regress: $(GIF2RGB)
- @for test in $(GIFS); \
+ for test in $(GIFS); \
do \
stem=`basename $${test} | sed -e "s/.gif$$//"`; \
$(UTILS)/giffilter <$${test} | $(UTILS)/gif2rgb | ./cmpdiffer "giffiltr: copy of $${test}" "$${stem}.rgb"; \
done
giffix-rebuild:
- @echo "Rebuilding giffix test."
- @head --bytes=-20 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d >giffixed.ico
+ echo "Rebuilding giffix test."
+ head --bytes=-20 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d >giffixed.ico
giffix-regress:
- @head --bytes=-20 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d | ./tapdiffer "giffix: Testing giffix behavior" giffixed.ico
+ head --bytes=-20 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d | ./tapdiffer "giffix: Testing giffix behavior" giffixed.ico
gifinto-regress:
- @rm -f $@.giflib.tmp
- @$(UTILS)/gifinto <$(PICS)/porsche.gif $@.giflib.tmp
- @if test ! -f $@.giflib.tmp; then echo "not ok - gifinto failed to create a file when it should have."; fi
- @rm -f $@.giflib.tmp
- @echo "0123456789" | $(UTILS)/gifinto $@.giflib.tmp 2>/dev/null
- @if test -f $@.giflib.tmp; \
+ rm -f $@.giflib.tmp
+ $(UTILS)/gifinto <$(PICS)/porsche.gif $@.giflib.tmp
+ if test ! -f $@.giflib.tmp; then echo "not ok - gifinto failed to create a file when it should have."; fi
+ rm -f $@.giflib.tmp
+ echo "0123456789" | $(UTILS)/gifinto $@.giflib.tmp 2>/dev/null
+ if test -f $@.giflib.tmp; \
then \
echo "not ok - gifinto created a file when it shouldn't have."; \
else \
echo "ok - gifinto correctly refrained from file creation."; \
fi
- @rm -f $@.giflib.tmp
+ rm -f $@.giflib.tmp
gifsponge-regress: $(GIF2RGB)
- @for test in $(GIFS); \
+ for test in $(GIFS); \
do \
stem=`basename $${test} | sed -e "s/.gif$$//"`; \
$(UTILS)/gifsponge <$${test} | $(UTILS)/gif2rgb | ./cmpdiffer "gifsponge: sink of $${test}" $${stem}.rgb; \
done
giftext-regress:
- @for test in $(GIFS); \
+ for test in $(GIFS); \
do \
stem=`basename $${test} | sed -e "s/.gif$$//"`; \
$(UTILS)/giftext <$${test} | ./cmpdiffer "text dump of $${test}" $${stem}.dmp; \
done
giftext-rebuild:
- @for test in $(GIFS); do \
+ for test in $(GIFS); do \
stem=`basename $${test} | sed -e "s/.gif$$//"`; \
echo "Remaking $${stem}.dmp"; \
$(UTILS)/giftext <$${test} >$${stem}.dmp; \
done
giftool-regress: $(GIF2RGB)
- @$(UTILS)/giftool <$(PICS)/gifgrid.gif | $(UTILS)/gif2rgb | ./cmpdiffer "giftool: expensive copy via giftool" gifgrid.rgb
- @$(UTILS)/giftool -i on <$(PICS)/treescap-interlaced.gif | $(UTILS)/gif2rgb | ./cmpdiffer "giftool: deinterlace" treescap.rgb
- @$(UTILS)/giftool -i off <$(PICS)/treescap.gif | $(UTILS)/gif2rgb | ./cmpdiffer "giftool: interlace" treescap-interlaced.rgb
+ $(UTILS)/giftool <$(PICS)/gifgrid.gif | $(UTILS)/gif2rgb | ./cmpdiffer "giftool: expensive copy via giftool" gifgrid.rgb
+ $(UTILS)/giftool -i on <$(PICS)/treescap-interlaced.gif | $(UTILS)/gif2rgb | ./cmpdiffer "giftool: deinterlace" treescap.rgb
+ $(UTILS)/giftool -i off <$(PICS)/treescap.gif | $(UTILS)/gif2rgb | ./cmpdiffer "giftool: interlace" treescap-interlaced.rgb
gifwedge-rebuild:
@echo "Remaking the gifwedge test."
- @$(UTILS)/gifwedge >wedge.gif
+ $(UTILS)/gifwedge >wedge.gif
gifwedge-regress:
- @$(UTILS)/gifwedge | ./cmpdiffer "gifwedge: wedge generation." wedge.gif
+ $(UTILS)/gifwedge | ./cmpdiffer "gifwedge: wedge generation." wedge.gif
|
