Index: uspace/srv/net/self_test.c
===================================================================
--- uspace/srv/net/self_test.c	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
+++ uspace/srv/net/self_test.c	(revision 02d9fecf1e3baf7c62bc4e7766c7c0d610639440)
@@ -57,14 +57,30 @@
  *  @param[in] result The expected result.
  */
-#define TEST(name, function_call, result);	{	\
-	printf("\n\t%s", (name)); 					\
-	if((function_call) != (result)){			\
-		printf("\tERROR\n");						\
-		error = 1;									\
-	}else{											\
-		printf("\tOK\n");							\
-	}												\
+#define TEST(name, function_call, result);	{								\
+	printf("\n\t%s", (name)); 												\
+	if((function_call) != (result)){										\
+		printf("\tERROR\n");												\
+		error = 1;															\
+	}else{																	\
+		printf("\tOK\n");													\
+	}																		\
 }
 
+#if NET_SELF_TEST_GENERIC_CHAR_MAP
+
+	GENERIC_CHAR_MAP_DECLARE(int_char_map, int)
+
+	GENERIC_CHAR_MAP_IMPLEMENT(int_char_map, int)
+
+#endif
+
+#if NET_SELF_TEST_GENERIC_FIELD
+
+	GENERIC_FIELD_DECLARE(int_field, int)
+
+	GENERIC_FIELD_IMPLEMENT(int_field, int)
+
+#endif
+
 #if NET_SELF_TEST_INT_MAP
 
@@ -72,20 +88,4 @@
 
 	INT_MAP_IMPLEMENT(int_map, int);
-
-#endif
-
-#if NET_SELF_TEST_GENERIC_FIELD
-
-	GENERIC_FIELD_DECLARE(int_field, int)
-
-	GENERIC_FIELD_IMPLEMENT(int_field, int)
-
-#endif
-
-#if NET_SELF_TEST_GENERIC_CHAR_MAP
-
-	GENERIC_CHAR_MAP_DECLARE(int_char_map, int)
-
-	GENERIC_CHAR_MAP_IMPLEMENT(int_char_map, int)
 
 #endif
@@ -101,13 +101,4 @@
 
 	error = 0;
-
-#if NET_SELF_TEST_MEASURED_STRINGS
-	measured_string_ref string;
-
-	printf("\nMeasured strings test");
-	string = measured_string_create_bulk("I am a measured string!", 0);
-	printf("\n%x, %s at %x of %d", string, string->value, string->value, string->length);
-	printf("\nOK");
-#endif
 
 #if NET_SELF_TEST_CHAR_MAP
@@ -160,4 +151,180 @@
 #endif
 
+#if NET_SELF_TEST_CRC
+	uint32_t value;
+
+	printf("\nCRC computation test");
+	value = ~ compute_crc32(~ 0, "123456789", 8 * 9);
+	TEST("123456789", value, 0xCBF43926);
+	printf("\t=> %X", value);
+	value = ~ compute_crc32(~ 0, "1", 8);
+	TEST("1", value, 0x83DCEFB7);
+	printf("\t=> %X", value);
+	value = ~ compute_crc32(~ 0, "12", 8 * 2);
+	TEST("12", value, 0x4F5344CD);
+	printf("\t=> %X", value);
+	value = ~ compute_crc32(~ 0, "123", 8 * 3);
+	TEST("123", value, 0x884863D2);
+	printf("\t=> %X", value);
+	value = ~ compute_crc32(~ 0, "1234", 8 * 4);
+	TEST("1234", value, 0x9BE3E0A3);
+	printf("\t=> %X", value);
+	value = ~ compute_crc32(~ 0, "12345678", 8 * 8);
+	TEST("12345678", value, 0x9AE0DAAF);
+	printf("\t=> %X", value);
+	value = ~ compute_crc32(~ 0, "ahoj pane", 8 * 9);
+	TEST("ahoj pane", value, 0x5FC3D706);
+	printf("\t=> %X", value);
+
+	if(error){
+		return EINVAL;
+	}
+
+#endif
+
+#if NET_SELF_TEST_DYNAMIC_FIFO
+	dyn_fifo_t fifo;
+
+	printf("\nDynamic fifo test");
+	TEST("add 1 einval", dyn_fifo_push(&fifo, 1, 0), EINVAL);
+	TEST("initialize", dyn_fifo_initialize(&fifo, 1), EOK);
+	TEST("add 1 eok", dyn_fifo_push(&fifo, 1, 0), EOK);
+	TEST("pop 1", dyn_fifo_pop(&fifo), 1);
+	TEST("pop enoent", dyn_fifo_pop(&fifo), ENOENT);
+	TEST("add 2 eok", dyn_fifo_push(&fifo, 2, 1), EOK);
+	TEST("add 3 enomem", dyn_fifo_push(&fifo, 3, 1), ENOMEM);
+	TEST("add 3 eok", dyn_fifo_push(&fifo, 3, 0), EOK);
+	TEST("pop 2", dyn_fifo_pop(&fifo), 2);
+	TEST("pop 3", dyn_fifo_pop(&fifo), 3);
+	TEST("add 4 eok", dyn_fifo_push(&fifo, 4, 2), EOK);
+	TEST("add 5 eok", dyn_fifo_push(&fifo, 5, 2), EOK);
+	TEST("add 6 enomem", dyn_fifo_push(&fifo, 6, 2), ENOMEM);
+	TEST("add 6 eok", dyn_fifo_push(&fifo, 6, 5), EOK);
+	TEST("add 7 eok", dyn_fifo_push(&fifo, 7, 5), EOK);
+	TEST("pop 4", dyn_fifo_pop(&fifo), 4);
+	TEST("pop 5", dyn_fifo_pop(&fifo), 5);
+	TEST("add 8 eok", dyn_fifo_push(&fifo, 8, 5), EOK);
+	TEST("add 9 eok", dyn_fifo_push(&fifo, 9, 5), EOK);
+	TEST("add 10 eok", dyn_fifo_push(&fifo, 10, 6), EOK);
+	TEST("add 11 eok", dyn_fifo_push(&fifo, 11, 6), EOK);
+	TEST("pop 6", dyn_fifo_pop(&fifo), 6);
+	TEST("pop 7", dyn_fifo_pop(&fifo), 7);
+	TEST("add 12 eok", dyn_fifo_push(&fifo, 12, 6), EOK);
+	TEST("add 13 eok", dyn_fifo_push(&fifo, 13, 6), EOK);
+	TEST("add 14 enomem", dyn_fifo_push(&fifo, 14, 6), ENOMEM);
+	TEST("add 14 eok", dyn_fifo_push(&fifo, 14, 8), EOK);
+	TEST("pop 8", dyn_fifo_pop(&fifo), 8);
+	TEST("pop 9", dyn_fifo_pop(&fifo), 9);
+	TEST("pop 10", dyn_fifo_pop(&fifo), 10);
+	TEST("pop 11", dyn_fifo_pop(&fifo), 11);
+	TEST("pop 12", dyn_fifo_pop(&fifo), 12);
+	TEST("pop 13", dyn_fifo_pop(&fifo), 13);
+	TEST("pop 14", dyn_fifo_pop(&fifo), 14);
+	TEST("destroy", dyn_fifo_destroy(&fifo), EOK);
+	TEST("add 15 einval", dyn_fifo_push(&fifo, 1, 0), EINVAL);
+	if(error){
+		return EINVAL;
+	}
+
+#endif
+
+#if NET_SELF_TEST_GENERIC_CHAR_MAP
+	int_char_map_t icm;
+
+	x = (int *) malloc(sizeof(int));
+	y = (int *) malloc(sizeof(int));
+	z = (int *) malloc(sizeof(int));
+	u = (int *) malloc(sizeof(int));
+	v = (int *) malloc(sizeof(int));
+	w = (int *) malloc(sizeof(int));
+
+	icm.magic = 0;
+	printf("\nGeneric char map test");
+	TEST("add ucho z einval", int_char_map_add(&icm, "ucho", 0, z), EINVAL);
+	TEST("initialize", int_char_map_initialize(&icm), EOK);
+	printf("\n\texclude bla null");
+	int_char_map_exclude(&icm, "bla", 0);
+	TEST("find bla null", int_char_map_find(&icm, "bla", 0), NULL);
+	TEST("add bla x eok", int_char_map_add(&icm, "bla", 0, x), EOK);
+	TEST("find bla x", int_char_map_find(&icm, "bla", 0), x);
+	TEST("add bla y eexists", int_char_map_add(&icm, "bla", 0, y), EEXISTS);
+	printf("\n\texclude bla y");
+	int_char_map_exclude(&icm, "bla", 0);
+	printf("\n\texclude bla null");
+	int_char_map_exclude(&icm, "bla", 0);
+	TEST("add blabla v eok", int_char_map_add(&icm, "blabla", 0, v), EOK);
+	TEST("find blabla v", int_char_map_find(&icm, "blabla", 0), v);
+	TEST("add bla w eok", int_char_map_add(&icm, "bla", 0, w), EOK);
+	TEST("find bla w", int_char_map_find(&icm, "bla", 0), w);
+	printf("\n\texclude bla");
+	int_char_map_exclude(&icm, "bla", 0);
+	TEST("find bla null", int_char_map_find(&icm, "bla", 0), NULL);
+	TEST("find blabla v", int_char_map_find(&icm, "blabla", 0), v);
+	TEST("add auto u eok", int_char_map_add(&icm, "auto", 0, u), EOK);
+	TEST("find auto u", int_char_map_find(&icm, "auto", 0), u);
+	printf("\n\tdestroy");
+	int_char_map_destroy(&icm);
+	TEST("add ucho z einval", int_char_map_add(&icm, "ucho", 0, z), EINVAL);
+	printf("\nOK");
+
+	if(error){
+		return EINVAL;
+	}
+
+#endif
+
+#if NET_SELF_TEST_GENERIC_FIELD
+	int_field_t gf;
+
+	x = (int *) malloc(sizeof(int));
+	y = (int *) malloc(sizeof(int));
+	z = (int *) malloc(sizeof(int));
+	u = (int *) malloc(sizeof(int));
+	v = (int *) malloc(sizeof(int));
+	w = (int *) malloc(sizeof(int));
+
+	gf.magic = 0;
+	printf("\nGeneric field test");
+	TEST("add x einval", int_field_add(&gf, x), EINVAL);
+	TEST("count -1", int_field_count(&gf), -1);
+	TEST("initialize", int_field_initialize(&gf), EOK);
+	TEST("count 0", int_field_count(&gf), 0);
+	TEST("get 1 null", int_field_get_index(&gf, 1), NULL);
+	TEST("add x 0", int_field_add(&gf, x), 0);
+	TEST("get 0 x", int_field_get_index(&gf, 0), x);
+	int_field_exclude_index(&gf, 0);
+	TEST("get 0 null", int_field_get_index(&gf, 0), NULL);
+	TEST("add y 1", int_field_add(&gf, y), 1);
+	TEST("get 1 y", int_field_get_index(&gf, 1), y);
+	TEST("add z 2", int_field_add(&gf, z), 2);
+	TEST("get 2 z", int_field_get_index(&gf, 2), z);
+	TEST("get 1 y", int_field_get_index(&gf, 1), y);
+	TEST("count 3", int_field_count(&gf), 3);
+	TEST("add u 3", int_field_add(&gf, u), 3);
+	TEST("get 3 u", int_field_get_index(&gf, 3), u);
+	TEST("add v 4", int_field_add(&gf, v), 4);
+	TEST("get 4 v", int_field_get_index(&gf, 4), v);
+	TEST("add w 5", int_field_add(&gf, w), 5);
+	TEST("get 5 w", int_field_get_index(&gf, 5), w);
+	TEST("count 6", int_field_count(&gf), 6);
+	int_field_exclude_index(&gf, 1);
+	TEST("get 1 null", int_field_get_index(&gf, 1), NULL);
+	TEST("get 3 u", int_field_get_index(&gf, 3), u);
+	int_field_exclude_index(&gf, 7);
+	TEST("get 3 u", int_field_get_index(&gf, 3), u);
+	TEST("get 5 w", int_field_get_index(&gf, 5), w);
+	int_field_exclude_index(&gf, 4);
+	TEST("get 4 null", int_field_get_index(&gf, 4), NULL);
+	printf("\n\tdestroy");
+	int_field_destroy(&gf);
+	TEST("count -1", int_field_count(&gf), -1);
+	printf("\nOK");
+
+	if(error){
+		return EINVAL;
+	}
+
+#endif
+
 #if NET_SELF_TEST_INT_MAP
 	int_map_t im;
@@ -216,178 +383,11 @@
 #endif
 
-#if NET_SELF_TEST_GENERIC_FIELD
-	int_field_t gf;
-
-	x = (int *) malloc(sizeof(int));
-	y = (int *) malloc(sizeof(int));
-	z = (int *) malloc(sizeof(int));
-	u = (int *) malloc(sizeof(int));
-	v = (int *) malloc(sizeof(int));
-	w = (int *) malloc(sizeof(int));
-
-	gf.magic = 0;
-	printf("\nGeneric field test");
-	TEST("add x einval", int_field_add(&gf, x), EINVAL);
-	TEST("count -1", int_field_count(&gf), -1);
-	TEST("initialize", int_field_initialize(&gf), EOK);
-	TEST("count 0", int_field_count(&gf), 0);
-	TEST("get 1 null", int_field_get_index(&gf, 1), NULL);
-	TEST("add x 0", int_field_add(&gf, x), 0);
-	TEST("get 0 x", int_field_get_index(&gf, 0), x);
-	int_field_exclude_index(&gf, 0);
-	TEST("get 0 null", int_field_get_index(&gf, 0), NULL);
-	TEST("add y 1", int_field_add(&gf, y), 1);
-	TEST("get 1 y", int_field_get_index(&gf, 1), y);
-	TEST("add z 2", int_field_add(&gf, z), 2);
-	TEST("get 2 z", int_field_get_index(&gf, 2), z);
-	TEST("get 1 y", int_field_get_index(&gf, 1), y);
-	TEST("count 3", int_field_count(&gf), 3);
-	TEST("add u 3", int_field_add(&gf, u), 3);
-	TEST("get 3 u", int_field_get_index(&gf, 3), u);
-	TEST("add v 4", int_field_add(&gf, v), 4);
-	TEST("get 4 v", int_field_get_index(&gf, 4), v);
-	TEST("add w 5", int_field_add(&gf, w), 5);
-	TEST("get 5 w", int_field_get_index(&gf, 5), w);
-	TEST("count 6", int_field_count(&gf), 6);
-	int_field_exclude_index(&gf, 1);
-	TEST("get 1 null", int_field_get_index(&gf, 1), NULL);
-	TEST("get 3 u", int_field_get_index(&gf, 3), u);
-	int_field_exclude_index(&gf, 7);
-	TEST("get 3 u", int_field_get_index(&gf, 3), u);
-	TEST("get 5 w", int_field_get_index(&gf, 5), w);
-	int_field_exclude_index(&gf, 4);
-	TEST("get 4 null", int_field_get_index(&gf, 4), NULL);
-	printf("\n\tdestroy");
-	int_field_destroy(&gf);
-	TEST("count -1", int_field_count(&gf), -1);
+#if NET_SELF_TEST_MEASURED_STRINGS
+	measured_string_ref string;
+
+	printf("\nMeasured strings test");
+	string = measured_string_create_bulk("I am a measured string!", 0);
+	printf("\n%x, %s at %x of %d", string, string->value, string->value, string->length);
 	printf("\nOK");
-
-	if(error){
-		return EINVAL;
-	}
-
-#endif
-
-#if NET_SELF_TEST_GENERIC_CHAR_MAP
-	int_char_map_t icm;
-
-	x = (int *) malloc(sizeof(int));
-	y = (int *) malloc(sizeof(int));
-	z = (int *) malloc(sizeof(int));
-	u = (int *) malloc(sizeof(int));
-	v = (int *) malloc(sizeof(int));
-	w = (int *) malloc(sizeof(int));
-
-	icm.magic = 0;
-	printf("\nGeneric char map test");
-	TEST("add ucho z einval", int_char_map_add(&icm, "ucho", 0, z), EINVAL);
-	TEST("initialize", int_char_map_initialize(&icm), EOK);
-	printf("\n\texclude bla null");
-	int_char_map_exclude(&icm, "bla", 0);
-	TEST("find bla null", int_char_map_find(&icm, "bla", 0), NULL);
-	TEST("add bla x eok", int_char_map_add(&icm, "bla", 0, x), EOK);
-	TEST("find bla x", int_char_map_find(&icm, "bla", 0), x);
-	TEST("add bla y eexists", int_char_map_add(&icm, "bla", 0, y), EEXISTS);
-	printf("\n\texclude bla y");
-	int_char_map_exclude(&icm, "bla", 0);
-	printf("\n\texclude bla null");
-	int_char_map_exclude(&icm, "bla", 0);
-	TEST("add blabla v eok", int_char_map_add(&icm, "blabla", 0, v), EOK);
-	TEST("find blabla v", int_char_map_find(&icm, "blabla", 0), v);
-	TEST("add bla w eok", int_char_map_add(&icm, "bla", 0, w), EOK);
-	TEST("find bla w", int_char_map_find(&icm, "bla", 0), w);
-	printf("\n\texclude bla");
-	int_char_map_exclude(&icm, "bla", 0);
-	TEST("find bla null", int_char_map_find(&icm, "bla", 0), NULL);
-	TEST("find blabla v", int_char_map_find(&icm, "blabla", 0), v);
-	TEST("add auto u eok", int_char_map_add(&icm, "auto", 0, u), EOK);
-	TEST("find auto u", int_char_map_find(&icm, "auto", 0), u);
-	printf("\n\tdestroy");
-	int_char_map_destroy(&icm);
-	TEST("add ucho z einval", int_char_map_add(&icm, "ucho", 0, z), EINVAL);
-	printf("\nOK");
-
-	if(error){
-		return EINVAL;
-	}
-
-#endif
-
-#if NET_SELF_TEST_CRC
-	uint32_t value;
-
-	printf("\nCRC computation test");
-	value = ~ compute_crc32(~ 0, "123456789", 8 * 9);
-	TEST("123456789", value, 0xCBF43926);
-	printf("\t=> %X", value);
-	value = ~ compute_crc32(~ 0, "1", 8);
-	TEST("1", value, 0x83DCEFB7);
-	printf("\t=> %X", value);
-	value = ~ compute_crc32(~ 0, "12", 8 * 2);
-	TEST("12", value, 0x4F5344CD);
-	printf("\t=> %X", value);
-	value = ~ compute_crc32(~ 0, "123", 8 * 3);
-	TEST("123", value, 0x884863D2);
-	printf("\t=> %X", value);
-	value = ~ compute_crc32(~ 0, "1234", 8 * 4);
-	TEST("1234", value, 0x9BE3E0A3);
-	printf("\t=> %X", value);
-	value = ~ compute_crc32(~ 0, "12345678", 8 * 8);
-	TEST("12345678", value, 0x9AE0DAAF);
-	printf("\t=> %X", value);
-	value = ~ compute_crc32(~ 0, "ahoj pane", 8 * 9);
-	TEST("ahoj pane", value, 0x5FC3D706);
-	printf("\t=> %X", value);
-
-	if(error){
-		return EINVAL;
-	}
-
-#endif
-
-#if NET_SELF_TEST_DYNAMIC_FIFO
-	dyn_fifo_t fifo;
-
-	printf("\nDynamic fifo test");
-	TEST("add 1 einval", dyn_fifo_push(&fifo, 1, 0), EINVAL);
-	TEST("initialize", dyn_fifo_initialize(&fifo, 1), EOK);
-	TEST("add 1 eok", dyn_fifo_push(&fifo, 1, 0), EOK);
-	TEST("pop 1", dyn_fifo_pop(&fifo), 1);
-	TEST("pop enoent", dyn_fifo_pop(&fifo), ENOENT);
-	TEST("add 2 eok", dyn_fifo_push(&fifo, 2, 1), EOK);
-	TEST("add 3 enomem", dyn_fifo_push(&fifo, 3, 1), ENOMEM);
-	TEST("add 3 eok", dyn_fifo_push(&fifo, 3, 0), EOK);
-	TEST("pop 2", dyn_fifo_pop(&fifo), 2);
-	TEST("pop 3", dyn_fifo_pop(&fifo), 3);
-	TEST("add 4 eok", dyn_fifo_push(&fifo, 4, 2), EOK);
-	TEST("add 5 eok", dyn_fifo_push(&fifo, 5, 2), EOK);
-	TEST("add 6 enomem", dyn_fifo_push(&fifo, 6, 2), ENOMEM);
-	TEST("add 6 eok", dyn_fifo_push(&fifo, 6, 5), EOK);
-	TEST("add 7 eok", dyn_fifo_push(&fifo, 7, 5), EOK);
-	TEST("pop 4", dyn_fifo_pop(&fifo), 4);
-	TEST("pop 5", dyn_fifo_pop(&fifo), 5);
-	TEST("add 8 eok", dyn_fifo_push(&fifo, 8, 5), EOK);
-	TEST("add 9 eok", dyn_fifo_push(&fifo, 9, 5), EOK);
-	TEST("add 10 eok", dyn_fifo_push(&fifo, 10, 6), EOK);
-	TEST("add 11 eok", dyn_fifo_push(&fifo, 11, 6), EOK);
-	TEST("pop 6", dyn_fifo_pop(&fifo), 6);
-	TEST("pop 7", dyn_fifo_pop(&fifo), 7);
-	TEST("add 12 eok", dyn_fifo_push(&fifo, 12, 6), EOK);
-	TEST("add 13 eok", dyn_fifo_push(&fifo, 13, 6), EOK);
-	TEST("add 14 enomem", dyn_fifo_push(&fifo, 14, 6), ENOMEM);
-	TEST("add 14 eok", dyn_fifo_push(&fifo, 14, 8), EOK);
-	TEST("pop 8", dyn_fifo_pop(&fifo), 8);
-	TEST("pop 9", dyn_fifo_pop(&fifo), 9);
-	TEST("pop 10", dyn_fifo_pop(&fifo), 10);
-	TEST("pop 11", dyn_fifo_pop(&fifo), 11);
-	TEST("pop 12", dyn_fifo_pop(&fifo), 12);
-	TEST("pop 13", dyn_fifo_pop(&fifo), 13);
-	TEST("pop 14", dyn_fifo_pop(&fifo), 14);
-	TEST("destroy", dyn_fifo_destroy(&fifo), EOK);
-	TEST("add 15 einval", dyn_fifo_push(&fifo, 1, 0), EINVAL);
-	if(error){
-		return EINVAL;
-	}
-
 #endif