1 |
--- tests/Makefile 2014-01-27 13:36:23.000000000 +0100 |
2 |
+++ tests/Makefile.oden 2014-02-08 11:33:53.984514464 +0100 |
3 |
@@ -7,7 +7,7 @@ |
4 |
-Wno-unused-function -Wno-unused-value |
5 |
|
6 |
OFLAGS = -O2 |
7 |
-LDFLAGS += -L../library -lpolarssl $(SYS_LDFLAGS) |
8 |
+LDFLAGS += -L../build/library -lpolarssl $(SYS_LDFLAGS) |
9 |
|
10 |
ifdef DEBUG |
11 |
CFLAGS += -g3 |
12 |
@@ -137,191 +137,191 @@ |
13 |
echo " Generate $@" |
14 |
scripts/generate_code.pl suites $* $* |
15 |
|
16 |
-test_suite_aes.ecb: test_suite_aes.ecb.c ../library/libpolarssl.a |
17 |
+test_suite_aes.ecb: test_suite_aes.ecb.c |
18 |
echo " CC $@.c" |
19 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
20 |
|
21 |
-test_suite_aes.cbc: test_suite_aes.cbc.c ../library/libpolarssl.a |
22 |
+test_suite_aes.cbc: test_suite_aes.cbc.c |
23 |
echo " CC $@.c" |
24 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
25 |
|
26 |
-test_suite_aes.cfb: test_suite_aes.cfb.c ../library/libpolarssl.a |
27 |
+test_suite_aes.cfb: test_suite_aes.cfb.c |
28 |
echo " CC $@.c" |
29 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
30 |
|
31 |
-test_suite_aes.rest: test_suite_aes.rest.c ../library/libpolarssl.a |
32 |
+test_suite_aes.rest: test_suite_aes.rest.c |
33 |
echo " CC $@.c" |
34 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
35 |
|
36 |
-test_suite_arc4: test_suite_arc4.c ../library/libpolarssl.a |
37 |
+test_suite_arc4: test_suite_arc4.c |
38 |
echo " CC $@.c" |
39 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
40 |
|
41 |
-test_suite_base64: test_suite_base64.c ../library/libpolarssl.a |
42 |
+test_suite_base64: test_suite_base64.c |
43 |
echo " CC $@.c" |
44 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
45 |
|
46 |
-test_suite_blowfish: test_suite_blowfish.c ../library/libpolarssl.a |
47 |
+test_suite_blowfish: test_suite_blowfish.c |
48 |
echo " CC $@.c" |
49 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
50 |
|
51 |
-test_suite_camellia: test_suite_camellia.c ../library/libpolarssl.a |
52 |
+test_suite_camellia: test_suite_camellia.c |
53 |
echo " CC $@.c" |
54 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
55 |
|
56 |
-test_suite_cipher.aes: test_suite_cipher.aes.c ../library/libpolarssl.a |
57 |
+test_suite_cipher.aes: test_suite_cipher.aes.c |
58 |
echo " CC $@.c" |
59 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
60 |
|
61 |
-test_suite_cipher.arc4: test_suite_cipher.arc4.c ../library/libpolarssl.a |
62 |
+test_suite_cipher.arc4: test_suite_cipher.arc4.c |
63 |
echo " CC $@.c" |
64 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
65 |
|
66 |
-test_suite_cipher.gcm: test_suite_cipher.gcm.c ../library/libpolarssl.a |
67 |
+test_suite_cipher.gcm: test_suite_cipher.gcm.c |
68 |
echo " CC $@.c" |
69 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
70 |
|
71 |
-test_suite_cipher.blowfish: test_suite_cipher.blowfish.c ../library/libpolarssl.a |
72 |
+test_suite_cipher.blowfish: test_suite_cipher.blowfish.c |
73 |
echo " CC $@.c" |
74 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
75 |
|
76 |
-test_suite_cipher.camellia: test_suite_cipher.camellia.c ../library/libpolarssl.a |
77 |
+test_suite_cipher.camellia: test_suite_cipher.camellia.c |
78 |
echo " CC $@.c" |
79 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
80 |
|
81 |
-test_suite_cipher.des: test_suite_cipher.des.c ../library/libpolarssl.a |
82 |
+test_suite_cipher.des: test_suite_cipher.des.c |
83 |
echo " CC $@.c" |
84 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
85 |
|
86 |
-test_suite_cipher.null: test_suite_cipher.null.c ../library/libpolarssl.a |
87 |
+test_suite_cipher.null: test_suite_cipher.null.c |
88 |
echo " CC $@.c" |
89 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
90 |
|
91 |
-test_suite_cipher.padding: test_suite_cipher.padding.c ../library/libpolarssl.a |
92 |
+test_suite_cipher.padding: test_suite_cipher.padding.c |
93 |
echo " CC $@.c" |
94 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
95 |
|
96 |
-test_suite_ctr_drbg: test_suite_ctr_drbg.c ../library/libpolarssl.a |
97 |
+test_suite_ctr_drbg: test_suite_ctr_drbg.c |
98 |
echo " CC $@.c" |
99 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
100 |
|
101 |
-test_suite_des: test_suite_des.c ../library/libpolarssl.a |
102 |
+test_suite_des: test_suite_des.c |
103 |
echo " CC $@.c" |
104 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
105 |
|
106 |
-test_suite_dhm: test_suite_dhm.c ../library/libpolarssl.a |
107 |
+test_suite_dhm: test_suite_dhm.c |
108 |
echo " CC $@.c" |
109 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
110 |
|
111 |
-test_suite_ecdh: test_suite_ecdh.c ../library/libpolarssl.a |
112 |
+test_suite_ecdh: test_suite_ecdh.c |
113 |
echo " CC $@.c" |
114 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
115 |
|
116 |
-test_suite_ecdsa: test_suite_ecdsa.c ../library/libpolarssl.a |
117 |
+test_suite_ecdsa: test_suite_ecdsa.c |
118 |
echo " CC $@.c" |
119 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
120 |
|
121 |
-test_suite_ecp: test_suite_ecp.c ../library/libpolarssl.a |
122 |
+test_suite_ecp: test_suite_ecp.c |
123 |
echo " CC $@.c" |
124 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
125 |
|
126 |
-test_suite_error: test_suite_error.c ../library/libpolarssl.a |
127 |
+test_suite_error: test_suite_error.c |
128 |
echo " CC $@.c" |
129 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
130 |
|
131 |
-test_suite_gcm.aes128_de: test_suite_gcm.aes128_de.c ../library/libpolarssl.a |
132 |
+test_suite_gcm.aes128_de: test_suite_gcm.aes128_de.c |
133 |
echo " CC $@.c" |
134 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
135 |
|
136 |
-test_suite_gcm.aes192_de: test_suite_gcm.aes192_de.c ../library/libpolarssl.a |
137 |
+test_suite_gcm.aes192_de: test_suite_gcm.aes192_de.c |
138 |
echo " CC $@.c" |
139 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
140 |
|
141 |
-test_suite_gcm.aes256_de: test_suite_gcm.aes256_de.c ../library/libpolarssl.a |
142 |
+test_suite_gcm.aes256_de: test_suite_gcm.aes256_de.c |
143 |
echo " CC $@.c" |
144 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
145 |
|
146 |
-test_suite_gcm.aes128_en: test_suite_gcm.aes128_en.c ../library/libpolarssl.a |
147 |
+test_suite_gcm.aes128_en: test_suite_gcm.aes128_en.c |
148 |
echo " CC $@.c" |
149 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
150 |
|
151 |
-test_suite_gcm.aes192_en: test_suite_gcm.aes192_en.c ../library/libpolarssl.a |
152 |
+test_suite_gcm.aes192_en: test_suite_gcm.aes192_en.c |
153 |
echo " CC $@.c" |
154 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
155 |
|
156 |
-test_suite_gcm.aes256_en: test_suite_gcm.aes256_en.c ../library/libpolarssl.a |
157 |
+test_suite_gcm.aes256_en: test_suite_gcm.aes256_en.c |
158 |
echo " CC $@.c" |
159 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
160 |
|
161 |
-test_suite_gcm.camellia: test_suite_gcm.camellia.c ../library/libpolarssl.a |
162 |
+test_suite_gcm.camellia: test_suite_gcm.camellia.c |
163 |
echo " CC $@.c" |
164 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
165 |
|
166 |
-test_suite_hmac_shax: test_suite_hmac_shax.c ../library/libpolarssl.a |
167 |
+test_suite_hmac_shax: test_suite_hmac_shax.c |
168 |
echo " CC $@.c" |
169 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
170 |
|
171 |
-test_suite_md: test_suite_md.c ../library/libpolarssl.a |
172 |
+test_suite_md: test_suite_md.c |
173 |
echo " CC $@.c" |
174 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
175 |
|
176 |
-test_suite_mdx: test_suite_mdx.c ../library/libpolarssl.a |
177 |
+test_suite_mdx: test_suite_mdx.c |
178 |
echo " CC $@.c" |
179 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
180 |
|
181 |
-test_suite_mpi: test_suite_mpi.c ../library/libpolarssl.a |
182 |
+test_suite_mpi: test_suite_mpi.c |
183 |
echo " CC $@.c" |
184 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
185 |
|
186 |
-test_suite_pbkdf2: test_suite_pbkdf2.c ../library/libpolarssl.a |
187 |
+test_suite_pbkdf2: test_suite_pbkdf2.c |
188 |
echo " CC $@.c" |
189 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
190 |
|
191 |
-test_suite_pkcs1_v21: test_suite_pkcs1_v21.c ../library/libpolarssl.a |
192 |
+test_suite_pkcs1_v21: test_suite_pkcs1_v21.c |
193 |
echo " CC $@.c" |
194 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
195 |
|
196 |
-test_suite_pkcs5: test_suite_pkcs5.c ../library/libpolarssl.a |
197 |
+test_suite_pkcs5: test_suite_pkcs5.c |
198 |
echo " CC $@.c" |
199 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
200 |
|
201 |
-test_suite_pkparse: test_suite_pkparse.c ../library/libpolarssl.a |
202 |
+test_suite_pkparse: test_suite_pkparse.c |
203 |
echo " CC $@.c" |
204 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
205 |
|
206 |
-test_suite_pkwrite: test_suite_pkwrite.c ../library/libpolarssl.a |
207 |
+test_suite_pkwrite: test_suite_pkwrite.c |
208 |
echo " CC $@.c" |
209 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
210 |
|
211 |
-test_suite_pk: test_suite_pk.c ../library/libpolarssl.a |
212 |
+test_suite_pk: test_suite_pk.c |
213 |
echo " CC $@.c" |
214 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
215 |
|
216 |
-test_suite_rsa: test_suite_rsa.c ../library/libpolarssl.a |
217 |
+test_suite_rsa: test_suite_rsa.c |
218 |
echo " CC $@.c" |
219 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
220 |
|
221 |
-test_suite_shax: test_suite_shax.c ../library/libpolarssl.a |
222 |
+test_suite_shax: test_suite_shax.c |
223 |
echo " CC $@.c" |
224 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
225 |
|
226 |
-test_suite_x509parse: test_suite_x509parse.c ../library/libpolarssl.a |
227 |
+test_suite_x509parse: test_suite_x509parse.c |
228 |
echo " CC $@.c" |
229 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
230 |
|
231 |
-test_suite_x509write: test_suite_x509write.c ../library/libpolarssl.a |
232 |
+test_suite_x509write: test_suite_x509write.c |
233 |
echo " CC $@.c" |
234 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
235 |
|
236 |
-test_suite_xtea: test_suite_xtea.c ../library/libpolarssl.a |
237 |
+test_suite_xtea: test_suite_xtea.c |
238 |
echo " CC $@.c" |
239 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
240 |
|
241 |
-test_suite_debug: test_suite_debug.c ../library/libpolarssl.a |
242 |
+test_suite_debug: test_suite_debug.c |
243 |
echo " CC $@.c" |
244 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
245 |
|
246 |
-test_suite_version: test_suite_version.c ../library/libpolarssl.a |
247 |
+test_suite_version: test_suite_version.c |
248 |
echo " CC $@.c" |
249 |
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
250 |
|
251 |
@@ -340,7 +340,7 @@ |
252 |
for i in $(APPS); \ |
253 |
do \ |
254 |
echo " - $${i}"; \ |
255 |
- RESULT=`./$${i} | grep -v 'PASS$$' | grep -v -- '----' | grep -v '^$$'`; \ |
256 |
+ RESULT=`LD_PRELOAD=../build/library/libpolarssl.so.5 ./$${i} | grep -v 'PASS$$' | grep -v -- '-----' | grep -v '^$$'`; \ |
257 |
FAILED=`echo $$RESULT |grep FAILED`; \ |
258 |
echo " $$RESULT"; \ |
259 |
if [ "$$FAILED" != "" ]; \ |