mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

Fix compilation failure in ATF due to gcc4.6.0 "improvements." RT #25598.

Browse Source
This commit is contained in:
Scott Mann 2011-08-24 19:53:11 +00:00
parent e80c4e6b79
commit 45a89e832d
5 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,3 +1,5 @@
3146. [test] Fixed gcc4.6.0 errors in ATF. [RT #25598]
--- 9.9.0a1 released ---
3145. [test] Capture output of ATF unit tests in "./atf.out" if

3
unit/atf-src/atf-c++/detail/application_test.cpp
View File

@ -52,16 +52,13 @@ public:
char *const argv[] = { arg1, arg2, arg3, arg4, NULL };
int ch;
bool zflag;
// Given that this obviously is an application, and that we used the
// same driver to start, we can test getopt(3) right here without doing
// any fancy stuff.
zflag = false;
while ((ch = ::getopt(argc, argv, ":Z")) != -1) {
switch (ch) {
case 'Z':
zflag = true;
break;
case '?':

3
unit/atf-src/atf-c/check.c
View File

@ -301,13 +301,12 @@ atf_check_result_init(atf_check_result_t *r, const char *const *argv,
const atf_fs_path_t *dir)
{
atf_error_t err;
const char *workdir;
r->pimpl = malloc(sizeof(struct atf_check_result_impl));
if (r->pimpl == NULL)
return atf_no_memory_error();
workdir = atf_config_get("atf_workdir");
(void) atf_config_get("atf_workdir");
err = array_to_list(argv, &r->pimpl->m_argv);
if (atf_is_error(err))

5
unit/atf-src/atf-c/detail/process_test.c
View File

@ -135,13 +135,12 @@ capture_stream_process(void *v, atf_process_child_t *c)
{
struct capture_stream *s = v;
bool eof;
switch (s->m_base.m_type) {
case stdout_type:
eof = read_line(atf_process_child_stdout(c), &s->m_msg);
(void) read_line(atf_process_child_stdout(c), &s->m_msg);
break;
case stderr_type:
eof = read_line(atf_process_child_stderr(c), &s->m_msg);
(void) read_line(atf_process_child_stderr(c), &s->m_msg);
break;
default:
UNREACHABLE;

3
unit/atf-src/atf-c/tp_test.c
View File

@ -54,16 +54,13 @@ ATF_TC_BODY(getopt, tc)
char *const argv[] = { arg1, arg2, arg3, arg4, NULL };
int ch;
bool zflag;
/* Given that this obviously is a test program, and that we used the
* same driver to start, we can test getopt(3) right here without doing
* any fancy stuff. */
zflag = false;
while ((ch = getopt(argc, argv, ":Z")) != -1) {
switch (ch) {
case 'Z':
zflag = true;
break;
case '?':