| 1 |
oden |
389394 |
--- tests/Makefile 2012-11-26 16:28:25.000000000 +0100 |
| 2 |
|
|
+++ tests/Makefile.oden 2013-01-18 12:21:38.494738609 +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 |
|
|
@@ -75,119 +75,119 @@ |
| 13 |
|
|
echo " Generate $@" |
| 14 |
|
|
scripts/generate_code.pl suites $* $* |
| 15 |
|
|
|
| 16 |
|
|
-test_suite_aes: test_suite_aes.c ../library/libpolarssl.a |
| 17 |
|
|
+test_suite_aes: test_suite_aes.c |
| 18 |
|
|
echo " CC $@.c" |
| 19 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 20 |
|
|
|
| 21 |
|
|
-test_suite_arc4: test_suite_arc4.c ../library/libpolarssl.a |
| 22 |
|
|
+test_suite_arc4: test_suite_arc4.c |
| 23 |
|
|
echo " CC $@.c" |
| 24 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 25 |
|
|
|
| 26 |
|
|
-test_suite_base64: test_suite_base64.c ../library/libpolarssl.a |
| 27 |
|
|
+test_suite_base64: test_suite_base64.c |
| 28 |
|
|
echo " CC $@.c" |
| 29 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 30 |
|
|
|
| 31 |
|
|
-test_suite_blowfish: test_suite_blowfish.c ../library/libpolarssl.a |
| 32 |
|
|
+test_suite_blowfish: test_suite_blowfish.c |
| 33 |
|
|
echo " CC $@.c" |
| 34 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 35 |
|
|
|
| 36 |
|
|
-test_suite_camellia: test_suite_camellia.c ../library/libpolarssl.a |
| 37 |
|
|
+test_suite_camellia: test_suite_camellia.c |
| 38 |
|
|
echo " CC $@.c" |
| 39 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 40 |
|
|
|
| 41 |
|
|
-test_suite_cipher.aes: test_suite_cipher.aes.c ../library/libpolarssl.a |
| 42 |
|
|
+test_suite_cipher.aes: test_suite_cipher.aes.c |
| 43 |
|
|
echo " CC $@.c" |
| 44 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 45 |
|
|
|
| 46 |
|
|
-test_suite_cipher.blowfish: test_suite_cipher.blowfish.c ../library/libpolarssl.a |
| 47 |
|
|
+test_suite_cipher.blowfish: test_suite_cipher.blowfish.c |
| 48 |
|
|
echo " CC $@.c" |
| 49 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 50 |
|
|
|
| 51 |
|
|
-test_suite_cipher.camellia: test_suite_cipher.camellia.c ../library/libpolarssl.a |
| 52 |
|
|
+test_suite_cipher.camellia: test_suite_cipher.camellia.c |
| 53 |
|
|
echo " CC $@.c" |
| 54 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 55 |
|
|
|
| 56 |
|
|
-test_suite_cipher.des: test_suite_cipher.des.c ../library/libpolarssl.a |
| 57 |
|
|
+test_suite_cipher.des: test_suite_cipher.des.c |
| 58 |
|
|
echo " CC $@.c" |
| 59 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 60 |
|
|
|
| 61 |
|
|
-test_suite_cipher.null: test_suite_cipher.null.c ../library/libpolarssl.a |
| 62 |
|
|
+test_suite_cipher.null: test_suite_cipher.null.c |
| 63 |
|
|
echo " CC $@.c" |
| 64 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 65 |
|
|
|
| 66 |
|
|
-test_suite_ctr_drbg: test_suite_ctr_drbg.c ../library/libpolarssl.a |
| 67 |
|
|
+test_suite_ctr_drbg: test_suite_ctr_drbg.c |
| 68 |
|
|
echo " CC $@.c" |
| 69 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 70 |
|
|
|
| 71 |
|
|
-test_suite_des: test_suite_des.c ../library/libpolarssl.a |
| 72 |
|
|
+test_suite_des: test_suite_des.c |
| 73 |
|
|
echo " CC $@.c" |
| 74 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 75 |
|
|
|
| 76 |
|
|
-test_suite_dhm: test_suite_dhm.c ../library/libpolarssl.a |
| 77 |
|
|
+test_suite_dhm: test_suite_dhm.c |
| 78 |
|
|
echo " CC $@.c" |
| 79 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 80 |
|
|
|
| 81 |
|
|
-test_suite_error: test_suite_error.c ../library/libpolarssl.a |
| 82 |
|
|
+test_suite_error: test_suite_error.c |
| 83 |
|
|
echo " CC $@.c" |
| 84 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 85 |
|
|
|
| 86 |
|
|
-test_suite_gcm.decrypt: test_suite_gcm.decrypt.c ../library/libpolarssl.a |
| 87 |
|
|
+test_suite_gcm.decrypt: test_suite_gcm.decrypt.c |
| 88 |
|
|
echo " CC $@.c" |
| 89 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 90 |
|
|
|
| 91 |
|
|
-test_suite_gcm.encrypt: test_suite_gcm.encrypt.c ../library/libpolarssl.a |
| 92 |
|
|
+test_suite_gcm.encrypt: test_suite_gcm.encrypt.c |
| 93 |
|
|
echo " CC $@.c" |
| 94 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 95 |
|
|
|
| 96 |
|
|
-test_suite_hmac_shax: test_suite_hmac_shax.c ../library/libpolarssl.a |
| 97 |
|
|
+test_suite_hmac_shax: test_suite_hmac_shax.c |
| 98 |
|
|
echo " CC $@.c" |
| 99 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 100 |
|
|
|
| 101 |
|
|
-test_suite_md: test_suite_md.c ../library/libpolarssl.a |
| 102 |
|
|
+test_suite_md: test_suite_md.c |
| 103 |
|
|
echo " CC $@.c" |
| 104 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 105 |
|
|
|
| 106 |
|
|
-test_suite_mdx: test_suite_mdx.c ../library/libpolarssl.a |
| 107 |
|
|
+test_suite_mdx: test_suite_mdx.c |
| 108 |
|
|
echo " CC $@.c" |
| 109 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 110 |
|
|
|
| 111 |
|
|
-test_suite_mpi: test_suite_mpi.c ../library/libpolarssl.a |
| 112 |
|
|
+test_suite_mpi: test_suite_mpi.c |
| 113 |
|
|
echo " CC $@.c" |
| 114 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 115 |
|
|
|
| 116 |
|
|
-test_suite_pbkdf2: test_suite_pbkdf2.c ../library/libpolarssl.a |
| 117 |
|
|
+test_suite_pbkdf2: test_suite_pbkdf2.c |
| 118 |
|
|
echo " CC $@.c" |
| 119 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 120 |
|
|
|
| 121 |
|
|
-test_suite_pkcs1_v21: test_suite_pkcs1_v21.c ../library/libpolarssl.a |
| 122 |
|
|
+test_suite_pkcs1_v21: test_suite_pkcs1_v21.c |
| 123 |
|
|
echo " CC $@.c" |
| 124 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 125 |
|
|
|
| 126 |
|
|
-test_suite_rsa: test_suite_rsa.c ../library/libpolarssl.a |
| 127 |
|
|
+test_suite_rsa: test_suite_rsa.c |
| 128 |
|
|
echo " CC $@.c" |
| 129 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 130 |
|
|
|
| 131 |
|
|
-test_suite_shax: test_suite_shax.c ../library/libpolarssl.a |
| 132 |
|
|
+test_suite_shax: test_suite_shax.c |
| 133 |
|
|
echo " CC $@.c" |
| 134 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 135 |
|
|
|
| 136 |
|
|
-test_suite_x509parse: test_suite_x509parse.c ../library/libpolarssl.a |
| 137 |
|
|
+test_suite_x509parse: test_suite_x509parse.c |
| 138 |
|
|
echo " CC $@.c" |
| 139 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 140 |
|
|
|
| 141 |
|
|
-test_suite_x509write: test_suite_x509write.c ../library/libpolarssl.a |
| 142 |
|
|
+test_suite_x509write: test_suite_x509write.c |
| 143 |
|
|
echo " CC $@.c" |
| 144 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 145 |
|
|
|
| 146 |
|
|
-test_suite_xtea: test_suite_xtea.c ../library/libpolarssl.a |
| 147 |
|
|
+test_suite_xtea: test_suite_xtea.c |
| 148 |
|
|
echo " CC $@.c" |
| 149 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 150 |
|
|
|
| 151 |
|
|
-test_suite_debug: test_suite_debug.c ../library/libpolarssl.a |
| 152 |
|
|
+test_suite_debug: test_suite_debug.c |
| 153 |
|
|
echo " CC $@.c" |
| 154 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 155 |
|
|
|
| 156 |
|
|
-test_suite_version: test_suite_version.c ../library/libpolarssl.a |
| 157 |
|
|
+test_suite_version: test_suite_version.c |
| 158 |
|
|
echo " CC $@.c" |
| 159 |
|
|
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ |
| 160 |
|
|
|
| 161 |
|
|
@@ -206,7 +206,7 @@ |
| 162 |
|
|
for i in $(APPS); \ |
| 163 |
|
|
do \ |
| 164 |
|
|
echo " - $${i}"; \ |
| 165 |
|
|
- RESULT=`./$${i} | grep -v 'PASS$$' | grep -v -- '-----' | grep -v '^$$'`; \ |
| 166 |
|
|
+ RESULT=`LD_PRELOAD=../build/library/libpolarssl.so.2 ./$${i} | grep -v 'PASS$$' | grep -v -- '-----' | grep -v '^$$'`; \ |
| 167 |
|
|
FAILED=`echo $$RESULT |grep FAILED`; \ |
| 168 |
|
|
echo " $$RESULT"; \ |
| 169 |
|
|
if [ "$$FAILED" != "" ]; \ |
Parent Directory
| 
Revision Log