Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Adam Osuchowski
Kea
Commits
bb7465ef
Commit
bb7465ef
authored
Jul 11, 2013
by
Thomas Markwalder
Browse files
[master] Corrected a build failure under Googletest 1.4
in D2 unit test.
parent
465c3330
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/bin/d2/tests/d_test_stubs.h
View file @
bb7465ef
...
...
@@ -608,11 +608,12 @@ public:
try
{
config_set_
=
isc
::
data
::
Element
::
fromJSON
(
json_text
);
}
catch
(
const
isc
::
Exception
&
ex
)
{
return
::
testing
::
AssertionFailure
()
<<
"JSON text failed to parse:"
<<
ex
.
what
();
return
(
::
testing
::
AssertionFailure
(
::
testing
::
Message
()
<<
"JSON text failed to parse:"
<<
ex
.
what
()));
}
return
::
testing
::
AssertionSuccess
();
return
(
::
testing
::
AssertionSuccess
()
)
;
}
...
...
@@ -628,11 +629,12 @@ public:
isc
::
data
::
ConstElementPtr
comment
;
comment
=
isc
::
config
::
parseAnswer
(
rcode
,
answer_
);
if
(
rcode
==
should_be
)
{
return
testing
::
AssertionSuccess
();
return
(
testing
::
AssertionSuccess
()
)
;
}
return
::
testing
::
AssertionFailure
()
<<
"checkAnswer rcode:"
<<
rcode
<<
" comment: "
<<
*
comment
;
return
(
::
testing
::
AssertionFailure
(
::
testing
::
Message
()
<<
"checkAnswer rcode:"
<<
rcode
<<
" comment: "
<<
*
comment
));
}
/// @brief Configuration set being tested.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment