[v4_1_esv]

Clean up ATF issues:
describe patch to ATF code for solaris 11
remove unneeded options for use on solaris 11
comment out unused hash test
[rt32089]

diff --git a/README b/README
index c7f7dd02d1af7be8ae57ce183f99e83fb03f0117..1507b0992975dc86637b8fe73c3d53732831dfcb 100644 (file)
--- a/README
+++ b/README
@@ -34,7 +34,8 @@ the ISC DHCP Distribution.
         5.7     NeXTSTEP
         5.8     SOLARIS
          5.8.1 Solaris 11
-         5.8.2 Other Solaris Items
+         5.8.2 Solaris 11 and ATF
+         5.8.3 Other Solaris Items
         5.9     AIX
         5.10    MacOS X
        6       SUPPORT
@@ -431,6 +432,36 @@ configuration step.  The command line would be something like:
 
          ./configure --enable-use-sockets --enable-ipv4-pktinfo
 
+                               Solaris 11 and ATF
+
+We have reports that ATF 0.15 and 0.16 do not build on Solaris 11.  The
+following changes to the ATF source code appear to fix this issue:
+
+diff -ru atf-0.15/atf-c/tp_test.c atf-0.15-patched/atf-c/tp_test.c
+--- atf-0.15/atf-c/tp_test.c 2011-12-06 06:31:11.000000000 +0100
++++ atf-0.15-patched/atf-c/tp_test.c 2012-06-19 15:54:57.000000000 +0200
+@@ -28,6 +28,7 @@
+*/
+
+#include <string.h>
++#include <stdio.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+diff -ru atf-0.15/atf-run/requirements.cpp atf-0.15-patched/atf-run/requirements.cpp
+--- atf-0.15/atf-run/requirements.cpp 2012-01-13 20:44:25.000000000 +0100
++++ atf-0.15-patched/atf-run/requirements.cpp 2012-06-19 15:41:51.000000000 +0200
+@@ -29,7 +29,7 @@
+
+extern "C" {
+#include <sys/param.h>
+-#include <sys/sysctl.h>
++//#include <sys/sysctl.h>
+}
+
+#include <cerrno>
+
                                Other Solaris Items
 
 One problem which has been observed and is not fixed in this

diff --git a/RELNOTES b/RELNOTES
index f310ece477cda044839bb45b718509d532722b1a..19f9b3d44d02ac9ea355a0af8382931cdaf00da0 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -53,6 +53,12 @@ The system has only been tested on Linux, FreeBSD, and Solaris, and may not
 work on other platforms. Please report any problems and suggested fixes to
 <dhcp-users@isc.org>.
 
+                       Changes since 4.1-ESV-R8b1
+
+- Modify test makefiles to be more similar to standard makefiles
+  and comment out a currently unused test.
+  [ISC-Bugs #32089]
+
                        Changes since 4.1-ESV-R7
 
 - Update the memory leakage debug code to work with v6.

diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
index d943a4e33fcd1974d373117fe18537e932149985..fe8a9b08aff6bc6743ae43d6ae6be7aab8509e72 100644 (file)
--- a/common/tests/Makefile.am
+++ b/common/tests/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = .
 
-AM_CPPFLAGS = $(ATF_CFLAGS) -std=c99 -I$(top_srcdir)/includes
+AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes
 
 EXTRA_DIST = Atffile
 

diff --git a/common/tests/Makefile.in b/common/tests/Makefile.in
index 35f77adbf372d76b7d29b317f42da157797fcbef..a401681862edb320fc32bd55fff1c7cba7262d4d 100644 (file)
--- a/common/tests/Makefile.in
+++ b/common/tests/Makefile.in
@@ -166,7 +166,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = .
-AM_CPPFLAGS = $(ATF_CFLAGS) -std=c99 -I$(top_srcdir)/includes
+AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes
 EXTRA_DIST = Atffile
 ATF_TESTS = $(am__append_1)
 @HAVE_ATF_TRUE@alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c

diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index 60e6f02dd93dd00121d288166d76c2adda444d84..ad23a751f3e139b69cfd0441b7bdba7bdad80a19 100644 (file)
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = .
 
 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
-AM_CPPFLAGS += -std=c99 -I$(top_srcdir)/bind/include -I$(top_srcdir)
-AM_CPPFLAGS += -DLOCALSTATEDIR='"."' -Wno-unused-function -Wno-error=unused-variable
+AM_CPPFLAGS += -I$(top_srcdir)/bind/include -I$(top_srcdir)
+AM_CPPFLAGS += -DLOCALSTATEDIR='"."'
 
 EXTRA_DIST = Atffile
 

diff --git a/server/tests/Makefile.in b/server/tests/Makefile.in
index 1d79dc92b942f21ed6a2504a0a41f9d40ef146dd..e7ae57fb6328bf6b45b99412dbf05d07aaa27758 100644 (file)
--- a/server/tests/Makefile.in
+++ b/server/tests/Makefile.in
@@ -212,9 +212,8 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = .
 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes \
-       -std=c99 -I$(top_srcdir)/bind/include -I$(top_srcdir) \
-       -DLOCALSTATEDIR='"."' -Wno-unused-function \
-       -Wno-error=unused-variable
+       -I$(top_srcdir)/bind/include -I$(top_srcdir) \
+       -DLOCALSTATEDIR='"."'
 EXTRA_DIST = Atffile
 DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c      \
           ../failover.c ../omapi.c ../mdb.c ../stables.c ../salloc.c \

diff --git a/server/tests/hash_unittest.c b/server/tests/hash_unittest.c
index da2046d2749c9885faf2271224c071f9c535386a..565aeec87eb4ae38c3ff864ee8f11539a31f41e4 100644 (file)
--- a/server/tests/hash_unittest.c
+++ b/server/tests/hash_unittest.c
@@ -531,6 +531,12 @@ ATF_TC_BODY(lease_hash_basic_3hosts, tc) {
                            clientid3, sizeof(clientid3));
 }
 
+#if 0
+/* This test is disabled as we solved the issue by prohibiting
+   the code from using an improper client id earlier and restoring
+   the hash code to its previous state.  As we may choose to
+   redo the hash code again this test hasn't been deleted.
+*/   
 /* this test is a direct reproduction of 29851 issue */
 ATF_TC(uid_hash_rt29851);
 
@@ -586,11 +592,7 @@ ATF_TC_BODY(uid_hash_rt29851, tc) {
     uid_hash_add(lease1);
     uid_hash_delete(lease2);
 }
-
-
-
-
-
+#endif
 
 ATF_TP_ADD_TCS(tp) {
     ATF_TP_ADD_TC(tp, lease_hash_basic_2hosts);
@@ -598,6 +600,8 @@ ATF_TP_ADD_TCS(tp) {
     ATF_TP_ADD_TC(tp, lease_hash_string_2hosts);
     ATF_TP_ADD_TC(tp, lease_hash_string_3hosts);
     ATF_TP_ADD_TC(tp, lease_hash_negative1);
+#if 0 /* see comment in function */
     ATF_TP_ADD_TC(tp, uid_hash_rt29851);
+#endif
     return (atf_no_error());
 }