diff options
| -rw-r--r-- | README | 33 | ||||
| -rw-r--r-- | RELNOTES | 3 | ||||
| -rw-r--r-- | common/tests/Makefile.am | 2 | ||||
| -rw-r--r-- | common/tests/Makefile.in | 2 | ||||
| -rw-r--r-- | server/tests/Makefile.am | 4 | ||||
| -rw-r--r-- | server/tests/Makefile.in | 5 | ||||
| -rw-r--r-- | server/tests/hash_unittest.c | 14 |
7 files changed, 50 insertions, 13 deletions
@@ -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 @@ -455,6 +456,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 @@ -187,6 +187,9 @@ work on other platforms. Please report any problems and suggested fixes to - Remove an unused variable to keep compilers happy. [ISC-Bugs #31983] +- Modify test makefiles to be more similar to standard makefiles + and comment out a currently unused test. + Changes since 4.2.3 ! Add a check for a null pointer before calling the regexec function. diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am index 43df7a98..5accf57b 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 395b376d..7a30033f 100644 --- a/common/tests/Makefile.in +++ b/common/tests/Makefile.in @@ -167,7 +167,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 6e5b79e0..d9945a12 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 667a1894..633192f6 100644 --- a/server/tests/Makefile.in +++ b/server/tests/Makefile.in @@ -217,9 +217,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 da2046d2..565aeec8 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()); } |