31 files changed, 6 insertions, 4 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f4460f0..a024d40 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,11 +1,13 @@
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
 
 macro(test prefix)
-    add_executable(${prefix}_encrypt_block ${prefix}_encrypt_block.c)
-    target_link_libraries(${prefix}_encrypt_block libaesni)
+    add_executable(test_${prefix}_encrypt ${prefix}_encrypt.c)
+    target_link_libraries(test_${prefix}_encrypt libaesni)
+    set_target_properties(test_${prefix}_encrypt PROPERTIES OUTPUT_NAME ${prefix}_encrypt)
 
-    add_executable(${prefix}_decrypt_block ${prefix}_decrypt_block.c)
-    target_link_libraries(${prefix}_decrypt_block libaesni)
+    add_executable(test_${prefix}_decrypt ${prefix}_decrypt.c)
+    target_link_libraries(test_${prefix}_decrypt libaesni)
+    set_target_properties(test_${prefix}_decrypt PROPERTIES OUTPUT_NAME ${prefix}_decrypt)
 endmacro()
 
 test(aes128ecb)
diff --git a/test/aes128cbc_decrypt_block.c b/test/aes128cbc_decrypt.c
index 791110a..791110a 100644
--- a/test/aes128cbc_decrypt_block.c
+++ b/test/aes128cbc_decrypt.c
diff --git a/test/aes128cbc_encrypt_block.c b/test/aes128cbc_encrypt.c
index a4a1675..a4a1675 100644
--- a/test/aes128cbc_encrypt_block.c
+++ b/test/aes128cbc_encrypt.c
diff --git a/test/aes128cfb_decrypt_block.c b/test/aes128cfb_decrypt.c
index bfc7ea7..bfc7ea7 100644
--- a/test/aes128cfb_decrypt_block.c
+++ b/test/aes128cfb_decrypt.c
diff --git a/test/aes128cfb_encrypt_block.c b/test/aes128cfb_encrypt.c
index b4e2885..b4e2885 100644
--- a/test/aes128cfb_encrypt_block.c
+++ b/test/aes128cfb_encrypt.c
diff --git a/test/aes128ctr_decrypt_block.c b/test/aes128ctr_decrypt.c
index 313e5d9..313e5d9 100644
--- a/test/aes128ctr_decrypt_block.c
+++ b/test/aes128ctr_decrypt.c
diff --git a/test/aes128ctr_encrypt_block.c b/test/aes128ctr_encrypt.c
index e5372c2..e5372c2 100644
--- a/test/aes128ctr_encrypt_block.c
+++ b/test/aes128ctr_encrypt.c
diff --git a/test/aes128ecb_decrypt_block.c b/test/aes128ecb_decrypt.c
index 70c7285..70c7285 100644
--- a/test/aes128ecb_decrypt_block.c
+++ b/test/aes128ecb_decrypt.c
diff --git a/test/aes128ecb_encrypt_block.c b/test/aes128ecb_encrypt.c
index 8f0bf0a..8f0bf0a 100644
--- a/test/aes128ecb_encrypt_block.c
+++ b/test/aes128ecb_encrypt.c
diff --git a/test/aes128ofb_decrypt_block.c b/test/aes128ofb_decrypt.c
index 74fb314..74fb314 100644
--- a/test/aes128ofb_decrypt_block.c
+++ b/test/aes128ofb_decrypt.c
diff --git a/test/aes128ofb_encrypt_block.c b/test/aes128ofb_encrypt.c
index df30777..df30777 100644
--- a/test/aes128ofb_encrypt_block.c
+++ b/test/aes128ofb_encrypt.c
diff --git a/test/aes192cbc_decrypt_block.c b/test/aes192cbc_decrypt.c
index 6a953ad..6a953ad 100644
--- a/test/aes192cbc_decrypt_block.c
+++ b/test/aes192cbc_decrypt.c
diff --git a/test/aes192cbc_encrypt_block.c b/test/aes192cbc_encrypt.c
index a1269b4..a1269b4 100644
--- a/test/aes192cbc_encrypt_block.c
+++ b/test/aes192cbc_encrypt.c
diff --git a/test/aes192cfb_decrypt_block.c b/test/aes192cfb_decrypt.c
index 906ecf9..906ecf9 100644
--- a/test/aes192cfb_decrypt_block.c
+++ b/test/aes192cfb_decrypt.c
diff --git a/test/aes192cfb_encrypt_block.c b/test/aes192cfb_encrypt.c
index 3261a03..3261a03 100644
--- a/test/aes192cfb_encrypt_block.c
+++ b/test/aes192cfb_encrypt.c
diff --git a/test/aes192ctr_decrypt_block.c b/test/aes192ctr_decrypt.c
index 01258ea..01258ea 100644
--- a/test/aes192ctr_decrypt_block.c
+++ b/test/aes192ctr_decrypt.c
diff --git a/test/aes192ctr_encrypt_block.c b/test/aes192ctr_encrypt.c
index 9a29005..9a29005 100644
--- a/test/aes192ctr_encrypt_block.c
+++ b/test/aes192ctr_encrypt.c
diff --git a/test/aes192ecb_decrypt_block.c b/test/aes192ecb_decrypt.c
index e6e749a..e6e749a 100644
--- a/test/aes192ecb_decrypt_block.c
+++ b/test/aes192ecb_decrypt.c
diff --git a/test/aes192ecb_encrypt_block.c b/test/aes192ecb_encrypt.c
index 2b4f688..2b4f688 100644
--- a/test/aes192ecb_encrypt_block.c
+++ b/test/aes192ecb_encrypt.c
diff --git a/test/aes192ofb_decrypt_block.c b/test/aes192ofb_decrypt.c
index 268b00c..268b00c 100644
--- a/test/aes192ofb_decrypt_block.c
+++ b/test/aes192ofb_decrypt.c
diff --git a/test/aes192ofb_encrypt_block.c b/test/aes192ofb_encrypt.c
index 8c866c3..8c866c3 100644
--- a/test/aes192ofb_encrypt_block.c
+++ b/test/aes192ofb_encrypt.c
diff --git a/test/aes256cbc_decrypt_block.c b/test/aes256cbc_decrypt.c
index 52abaff..52abaff 100644
--- a/test/aes256cbc_decrypt_block.c
+++ b/test/aes256cbc_decrypt.c
diff --git a/test/aes256cbc_encrypt_block.c b/test/aes256cbc_encrypt.c
index 0b10f54..0b10f54 100644
--- a/test/aes256cbc_encrypt_block.c
+++ b/test/aes256cbc_encrypt.c
diff --git a/test/aes256cfb_decrypt_block.c b/test/aes256cfb_decrypt.c
index d3f6075..d3f6075 100644
--- a/test/aes256cfb_decrypt_block.c
+++ b/test/aes256cfb_decrypt.c
diff --git a/test/aes256cfb_encrypt_block.c b/test/aes256cfb_encrypt.c
index c14e931..c14e931 100644
--- a/test/aes256cfb_encrypt_block.c
+++ b/test/aes256cfb_encrypt.c
diff --git a/test/aes256ctr_decrypt_block.c b/test/aes256ctr_decrypt.c
index db7ae5c..db7ae5c 100644
--- a/test/aes256ctr_decrypt_block.c
+++ b/test/aes256ctr_decrypt.c
diff --git a/test/aes256ctr_encrypt_block.c b/test/aes256ctr_encrypt.c
index d812a86..d812a86 100644
--- a/test/aes256ctr_encrypt_block.c
+++ b/test/aes256ctr_encrypt.c
diff --git a/test/aes256ecb_decrypt_block.c b/test/aes256ecb_decrypt.c
index a290eed..a290eed 100644
--- a/test/aes256ecb_decrypt_block.c
+++ b/test/aes256ecb_decrypt.c
diff --git a/test/aes256ecb_encrypt_block.c b/test/aes256ecb_encrypt.c
index 2a4899e..2a4899e 100644
--- a/test/aes256ecb_encrypt_block.c
+++ b/test/aes256ecb_encrypt.c
diff --git a/test/aes256ofb_decrypt_block.c b/test/aes256ofb_decrypt.c
index 282dc6a..282dc6a 100644
--- a/test/aes256ofb_decrypt_block.c
+++ b/test/aes256ofb_decrypt.c
diff --git a/test/aes256ofb_encrypt_block.c b/test/aes256ofb_encrypt.c
index b74f29f..b74f29f 100644
--- a/test/aes256ofb_encrypt_block.c
+++ b/test/aes256ofb_encrypt.c