Commit 4d9485ae authored by Jeremy C. Reed's avatar Jeremy C. Reed
Browse files

[master] whitespace police

parent 7ad41d91
...@@ -730,7 +730,7 @@ then ...@@ -730,7 +730,7 @@ then
GTEST_FOUND="true" GTEST_FOUND="true"
# There is no gtest-config script on this # There is no gtest-config script on this
# system, which is supposed to inform us # system, which is supposed to inform us
# whether we need pthreads as well (a # whether we need pthreads as well (a
# gtest compile-time option). So we still # gtest compile-time option). So we still
# need to test that manually. # need to test that manually.
CPPFLAGS_SAVED="$CPPFLAGS" CPPFLAGS_SAVED="$CPPFLAGS"
......
...@@ -39,4 +39,3 @@ b10_dhcp4_LDADD += $(top_builddir)/src/lib/log/liblog.la ...@@ -39,4 +39,3 @@ b10_dhcp4_LDADD += $(top_builddir)/src/lib/log/liblog.la
# and can't use @datadir@ because doesn't expand default ${prefix} # and can't use @datadir@ because doesn't expand default ${prefix}
b10_dhcp4dir = $(pkgdatadir) b10_dhcp4dir = $(pkgdatadir)
b10_dhcp4_DATA = dhcp4.spec b10_dhcp4_DATA = dhcp4.spec
...@@ -16,7 +16,7 @@ TESTS += run_unittests ...@@ -16,7 +16,7 @@ TESTS += run_unittests
run_unittests_SOURCES = run_unittests.cc run_unittests_SOURCES = run_unittests.cc
run_unittests_SOURCES += crypto_unittests.cc run_unittests_SOURCES += crypto_unittests.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(BOTAN_LDFLAGS) $(GTEST_LDFLAGS) $(AM_LDFLAGS) run_unittests_LDFLAGS = $(BOTAN_LDFLAGS) $(GTEST_LDFLAGS) $(AM_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD) $(BOTAN_LIBS) run_unittests_LDADD = $(GTEST_LDADD) $(BOTAN_LIBS)
run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la
run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libcryptolink.la run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libcryptolink.la
......
...@@ -412,7 +412,7 @@ DatabaseClient::Finder::findDelegationPoint(const isc::dns::Name& name, ...@@ -412,7 +412,7 @@ DatabaseClient::Finder::findDelegationPoint(const isc::dns::Name& name,
// cut but the match we find for the glue is a wildcard match. In that // cut but the match we find for the glue is a wildcard match. In that
// case, we return the delegation instead (see RFC 1034, section 4.3.3). // case, we return the delegation instead (see RFC 1034, section 4.3.3).
// To save a new search, we record the location of the delegation cut when // To save a new search, we record the location of the delegation cut when
// we encounter it here. // we encounter it here.
isc::dns::ConstRRsetPtr first_ns; isc::dns::ConstRRsetPtr first_ns;
// We want to search from the apex down. We are given the full domain // We want to search from the apex down. We are given the full domain
......
...@@ -101,7 +101,7 @@ TEST_F(CounterDictionaryTest, invalidCounterItem) { ...@@ -101,7 +101,7 @@ TEST_F(CounterDictionaryTest, invalidCounterItem) {
TEST_F(CounterDictionaryTest, uniquenessCheck) { TEST_F(CounterDictionaryTest, uniquenessCheck) {
// Adding an element which already exists will cause an isc::OutOfRange // Adding an element which already exists will cause an isc::OutOfRange
// exception // exception
EXPECT_THROW(counters.addElement("test"), isc::InvalidParameter); EXPECT_THROW(counters.addElement("test"), isc::InvalidParameter);
} }
......
Supports Markdown
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