Hi Konstantin,

>Could you explain why do we need that define at all?
>As I can read the code, right now IPV4_IPOPT_MANUAL is always defined,
>so all '#else' blocks are simply dead code.
>Is there any reason to keep it?
>If so, then the code probably need to be re-ordered somehow, 
>to make '#else' part to be enabled and executed: 
>let say a separate test-case(s), and/or separate function or extra parameter
>for  test_get_ipv4_opt().

The code for the '#else' part is a relatively simple way to organize the test data, there is no need to stitch all the data together manually, but it is not as freely organized as the '#if' part of the code, and it was intended that as an alternative, I will remove the code of the '#else' part and resend the patch.

Huichao Cai