diff options
| author | Shawn Routhier <sar@isc.org> | 2016-01-12 12:33:26 -0800 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.org> | 2016-01-12 12:33:26 -0800 |
| commit | eda1d0aa5a24f46de742bf7fd2989ae58d72cf78 (patch) | |
| tree | 20307dd492d284d41c02054b3904a9284a9fd6d9 /server | |
| parent | 75ab52e12ba75ecdbe8f79c15bb614260999741c (diff) | |
| download | isc-dhcp-eda1d0aa5a24f46de742bf7fd2989ae58d72cf78.tar.gz | |
[master] Hnadle dhcpv6 being disabled better
The previous patches didn't handle dhvpv6 being disabled well.
This change moves the #ifdefs a bit to handle it.
Diffstat (limited to 'server')
| -rw-r--r-- | server/tests/simple_unittest.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/server/tests/simple_unittest.c b/server/tests/simple_unittest.c index 5e1db919..c345aefd 100644 --- a/server/tests/simple_unittest.c +++ b/server/tests/simple_unittest.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2012,2015-2016 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -67,7 +67,7 @@ ATF_TC_BODY(simple_test_case, tc) } - +#ifdef DHCPv6 ATF_TC(parse_byte_order); ATF_TC_HEAD(parse_byte_order, tc) @@ -110,7 +110,7 @@ ATF_TC_BODY(parse_byte_order, tc) atf_tc_pass(); } - +#endif /* DHCPv6 */ /* This macro defines main() method that will call specified test cases. tp and simple_test_case names can be whatever you want @@ -118,7 +118,8 @@ ATF_TC_BODY(parse_byte_order, tc) ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, simple_test_case); +#ifdef DHCPv6 ATF_TP_ADD_TC(tp, parse_byte_order); - +#endif return (atf_no_error()); } |