1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Merge branch 'master' into plugins

This commit is contained in:
James Booth 2014-06-15 19:27:48 +01:00
commit 27c1b429c1
3 changed files with 30 additions and 30 deletions

File diff suppressed because one or more lines are too long

View File

@ -38,11 +38,11 @@ void test_dnd_is_valid_resource_presence_string(void **state);
void test_available_is_not_valid_resource_presence_string(void **state); void test_available_is_not_valid_resource_presence_string(void **state);
void test_unavailable_is_not_valid_resource_presence_string(void **state); void test_unavailable_is_not_valid_resource_presence_string(void **state);
void test_blah_is_not_valid_resource_presence_string(void **state); void test_blah_is_not_valid_resource_presence_string(void **state);
void test_sha1_hash1(void **state); void test_p_sha1_hash1(void **state);
void test_sha1_hash2(void **state); void test_p_sha1_hash2(void **state);
void test_sha1_hash3(void **state); void test_p_sha1_hash3(void **state);
void test_sha1_hash4(void **state); void test_p_sha1_hash4(void **state);
void test_sha1_hash5(void **state); void test_p_sha1_hash5(void **state);
void test_sha1_hash6(void **state); void test_p_sha1_hash6(void **state);
void test_sha1_hash6(void **state); void test_p_sha1_hash6(void **state);
void test_sha1_hash7(void **state); void test_p_sha1_hash7(void **state);

View File

@ -74,13 +74,13 @@ int main(int argc, char* argv[]) {
unit_test(test_available_is_not_valid_resource_presence_string), unit_test(test_available_is_not_valid_resource_presence_string),
unit_test(test_unavailable_is_not_valid_resource_presence_string), unit_test(test_unavailable_is_not_valid_resource_presence_string),
unit_test(test_blah_is_not_valid_resource_presence_string), unit_test(test_blah_is_not_valid_resource_presence_string),
unit_test(test_sha1_hash1), unit_test(test_p_sha1_hash1),
unit_test(test_sha1_hash2), unit_test(test_p_sha1_hash2),
unit_test(test_sha1_hash3), unit_test(test_p_sha1_hash3),
unit_test(test_sha1_hash4), unit_test(test_p_sha1_hash4),
unit_test(test_sha1_hash5), unit_test(test_p_sha1_hash5),
unit_test(test_sha1_hash6), unit_test(test_p_sha1_hash6),
unit_test(test_sha1_hash7), unit_test(test_p_sha1_hash7),
unit_test(clear_empty), unit_test(clear_empty),
unit_test(reset_after_create), unit_test(reset_after_create),