From: Tomasz Flendrich <tflendrich@ntp.org>
Date: Sun, 26 Jul 2015 21:24:26 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
X-Git-Tag: NTP_4_3_65~7^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=302301bf7174e201cb392785dc10c39f361dc6b7;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
into  psp-deb1.ntp.org:/home/tflendrich/ntpd_tests/ntp-stable-unity

bk: 55b5500acEZbTqd2GN7vLCZ45-GYlw
---

302301bf7174e201cb392785dc10c39f361dc6b7
diff --cc tests/libntp/socktoa.c
index bd584d347,bd4e4286b..9ce3a1e99
--- a/tests/libntp/socktoa.c
+++ b/tests/libntp/socktoa.c
@@@ -4,11 -4,17 +4,17 @@@
  #include "ntp_calendar.h"
  
  #include "unity.h"
 -
  #include "sockaddrtest.h"
  
+ void test_IPv4AddressWithPort(void);
+ void test_IPv6AddressWithPort(void);
+ void test_ScopedIPv6AddressWithPort(void);
+ void test_HashEqual(void);
+ void test_HashNotEqual(void);
+ void test_IgnoreIPv6Fields(void);
  
 -void test_IPv4AddressWithPort(void) {
 +void 
 +test_IPv4AddressWithPort(void) {
  	sockaddr_u input = CreateSockaddr4("192.0.2.10", 123);
  
  	TEST_ASSERT_EQUAL_STRING("192.0.2.10", socktoa(&input));