From 1dab26a08da377b8a8a73945a20f3840e897efdf Mon Sep 17 00:00:00 2001 From: Shawn Routhier Date: Thu, 13 Dec 2012 11:37:19 -0800 Subject: [PATCH] [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] --- README | 33 ++++++++++++++++++++++++++++++++- RELNOTES | 6 ++++++ common/tests/Makefile.am | 2 +- common/tests/Makefile.in | 2 +- server/tests/Makefile.am | 4 ++-- server/tests/Makefile.in | 5 ++--- server/tests/hash_unittest.c | 14 +++++++++----- 7 files changed, 53 insertions(+), 13 deletions(-) diff --git a/README b/README index c7f7dd02d..1507b0992 100644 --- 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 ++#include +#include + +#include + +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 +-#include ++//#include +} + +#include + Other Solaris Items One problem which has been observed and is not fixed in this diff --git a/RELNOTES b/RELNOTES index f310ece47..19f9b3d44 100644 --- 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 . + 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 d943a4e33..fe8a9b08a 100644 --- 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 35f77adbf..a40168186 100644 --- 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 60e6f02dd..ad23a751f 100644 --- 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 1d79dc92b..e7ae57fb6 100644 --- 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 da2046d27..565aeec87 100644 --- 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()); } -- 2.47.3