Commit 1dab26a0 authored by Shawn Routhier's avatar Shawn Routhier
Browse files

[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]
parent 279b11f3
...@@ -34,7 +34,8 @@ the ISC DHCP Distribution. ...@@ -34,7 +34,8 @@ the ISC DHCP Distribution.
5.7 NeXTSTEP 5.7 NeXTSTEP
5.8 SOLARIS 5.8 SOLARIS
5.8.1 Solaris 11 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.9 AIX
5.10 MacOS X 5.10 MacOS X
6 SUPPORT 6 SUPPORT
...@@ -431,6 +432,36 @@ configuration step. The command line would be something like: ...@@ -431,6 +432,36 @@ configuration step. The command line would be something like:
./configure --enable-use-sockets --enable-ipv4-pktinfo ./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 Other Solaris Items
One problem which has been observed and is not fixed in this One problem which has been observed and is not fixed in this
......
...@@ -53,6 +53,12 @@ The system has only been tested on Linux, FreeBSD, and Solaris, and may not ...@@ -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 work on other platforms. Please report any problems and suggested fixes to
<dhcp-users@isc.org>. <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 Changes since 4.1-ESV-R7
- Update the memory leakage debug code to work with v6. - Update the memory leakage debug code to work with v6.
......
SUBDIRS = . SUBDIRS = .
AM_CPPFLAGS = $(ATF_CFLAGS) -std=c99 -I$(top_srcdir)/includes AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes
EXTRA_DIST = Atffile EXTRA_DIST = Atffile
......
...@@ -166,7 +166,7 @@ top_build_prefix = @top_build_prefix@ ...@@ -166,7 +166,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
SUBDIRS = . SUBDIRS = .
AM_CPPFLAGS = $(ATF_CFLAGS) -std=c99 -I$(top_srcdir)/includes AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes
EXTRA_DIST = Atffile EXTRA_DIST = Atffile
ATF_TESTS = $(am__append_1) ATF_TESTS = $(am__append_1)
@HAVE_ATF_TRUE@alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c @HAVE_ATF_TRUE@alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
......
SUBDIRS = . SUBDIRS = .
AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
AM_CPPFLAGS += -std=c99 -I$(top_srcdir)/bind/include -I$(top_srcdir) AM_CPPFLAGS += -I$(top_srcdir)/bind/include -I$(top_srcdir)
AM_CPPFLAGS += -DLOCALSTATEDIR='"."' -Wno-unused-function -Wno-error=unused-variable AM_CPPFLAGS += -DLOCALSTATEDIR='"."'
EXTRA_DIST = Atffile EXTRA_DIST = Atffile
......
...@@ -212,9 +212,8 @@ top_builddir = @top_builddir@ ...@@ -212,9 +212,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
SUBDIRS = . SUBDIRS = .
AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes \ AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes \
-std=c99 -I$(top_srcdir)/bind/include -I$(top_srcdir) \ -I$(top_srcdir)/bind/include -I$(top_srcdir) \
-DLOCALSTATEDIR='"."' -Wno-unused-function \ -DLOCALSTATEDIR='"."'
-Wno-error=unused-variable
EXTRA_DIST = Atffile EXTRA_DIST = Atffile
DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c \ DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c \
../failover.c ../omapi.c ../mdb.c ../stables.c ../salloc.c \ ../failover.c ../omapi.c ../mdb.c ../stables.c ../salloc.c \
......
...@@ -531,6 +531,12 @@ ATF_TC_BODY(lease_hash_basic_3hosts, tc) { ...@@ -531,6 +531,12 @@ ATF_TC_BODY(lease_hash_basic_3hosts, tc) {
clientid3, sizeof(clientid3)); 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 */ /* this test is a direct reproduction of 29851 issue */
ATF_TC(uid_hash_rt29851); ATF_TC(uid_hash_rt29851);
...@@ -586,11 +592,7 @@ ATF_TC_BODY(uid_hash_rt29851, tc) { ...@@ -586,11 +592,7 @@ ATF_TC_BODY(uid_hash_rt29851, tc) {
uid_hash_add(lease1); uid_hash_add(lease1);
uid_hash_delete(lease2); uid_hash_delete(lease2);
} }
#endif
ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TCS(tp) {
ATF_TP_ADD_TC(tp, lease_hash_basic_2hosts); ATF_TP_ADD_TC(tp, lease_hash_basic_2hosts);
...@@ -598,6 +600,8 @@ ATF_TP_ADD_TCS(tp) { ...@@ -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_2hosts);
ATF_TP_ADD_TC(tp, lease_hash_string_3hosts); ATF_TP_ADD_TC(tp, lease_hash_string_3hosts);
ATF_TP_ADD_TC(tp, lease_hash_negative1); ATF_TP_ADD_TC(tp, lease_hash_negative1);
#if 0 /* see comment in function */
ATF_TP_ADD_TC(tp, uid_hash_rt29851); ATF_TP_ADD_TC(tp, uid_hash_rt29851);
#endif
return (atf_no_error()); return (atf_no_error());
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment