From 8e416b3027a67be213bcff6cbc4c822a8f57c099 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Fri, 21 Feb 2020 14:09:17 +0100 Subject: [PATCH] Prepare for reformat-all --- .circleci/config.yml | 7 ++-- build-scripts/format-code | 11 +++++- pdns/test-bindparser_cc.cc | 73 +++++++++++++++++++------------------- 3 files changed, 51 insertions(+), 40 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1cb80c3832..5cbe3f8536 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -498,14 +498,15 @@ jobs: - run: name: Install dependencies command: | - apt-get update && apt-get -qq --no-install-recommends install \ - clang-format git + echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/backports.list + apt-get update && apt-get -qq --no-install-recommends install git + apt-get -qq -t buster-backports --no-install-recommends install clang-format-8 - get-workspace - run: name: Check formatting command: | ./build-scripts/format-code pdns/recursordist/*.[ch][ch] - git diff + git --no-pager diff exit $(git diff | wc -l) working_directory: ~/project diff --git a/build-scripts/format-code b/build-scripts/format-code index 8a34910e07..870d793bed 100755 --- a/build-scripts/format-code +++ b/build-scripts/format-code @@ -28,6 +28,15 @@ if [ x$CIRCLECI = xtrue ]; then verbose=0 fi +FORMAT=clang-format-8 +if ! which $FORMAT 2> /dev/null; then + FORMAT=clang-format +fi + +if [ $verbose = 1 ]; then + echo Using executable $FORMAT +fi + for file in "${@}"; do if [ -h "$file" -o ! -f "$file" ]; then if [ $verbose = 1 ]; then @@ -36,7 +45,7 @@ for file in "${@}"; do continue fi tmp=$(mktemp "$file.XXXXXXXX") - if ! clang-format -style=file "$file" > "$tmp"; then + if ! $FORMAT -style=file "$file" > "$tmp"; then rm "$tmp" else if ! cmp -s "$file" "$tmp"; then diff --git a/pdns/test-bindparser_cc.cc b/pdns/test-bindparser_cc.cc index 5497d033d0..a8761f381b 100644 --- a/pdns/test-bindparser_cc.cc +++ b/pdns/test-bindparser_cc.cc @@ -19,42 +19,43 @@ using std::string; BOOST_AUTO_TEST_SUITE(test_bindparser_cc) -BOOST_AUTO_TEST_CASE(test_parser) { - const char *srcdir; - std::ostringstream pathbuf; - BindParser BP; - BOOST_CHECK_THROW( BP.parse("../regression-tests/named.confx"), PDNSException); - BP.setVerbose(true); - srcdir = std::getenv("SRCDIR"); - if(!srcdir) - srcdir="."; // assume no shenanigans - - pathbuf << srcdir << "/../pdns/named.conf.parsertest"; - BP.parse(pathbuf.str()); - - vector domains=BP.getDomains(); - BOOST_CHECK_EQUAL(domains.size(), 11U); - -#define checkzone(i, dname, fname, ztype, nmasters) { \ - BOOST_CHECK(domains[i].name == DNSName(#dname)); \ - BOOST_CHECK_EQUAL(domains[i].filename, fname); \ - BOOST_CHECK_EQUAL(domains[i].type, #ztype); \ - BOOST_CHECK_EQUAL(domains[i].masters.size(), nmasters); \ - } - - checkzone(0, example.com, "./zones//example.com", master, 0U); - checkzone(1, test.com, "./zones//test.com", slave, 1U); - BOOST_CHECK_EQUAL(domains[1].masters[0].toString(), ComboAddress("1.2.3.4", 5678).toString()); - checkzone(2, test.dyndns, "./zones//test.dyndns", garblewarble, 0U); - checkzone(3, wtest.com, "./zones//wtest.com", master, 0U); - checkzone(4, nztest.com, "./zones//nztest.com", master, 0U); - checkzone(5, dnssec-parent.com, "./zones//dnssec-parent.com", master, 0U); - checkzone(6, delegated.dnssec-parent.com, "./zones//delegated.dnssec-parent.com", master, 0U); - checkzone(7, secure-delegated.dnssec-parent.com, "./zones//secure-delegated.dnssec-parent.com", master, 0U); - checkzone(8, minimal.com, "./zones//minimal.com", master, 0U); - checkzone(9, tsig.com, "./zones//tsig.com", master, 0U); - checkzone(10, stest.com, "./zones//stest.com", master, 0U); +BOOST_AUTO_TEST_CASE(test_parser) +{ + const char* srcdir; + std::ostringstream pathbuf; + BindParser BP; + BOOST_CHECK_THROW(BP.parse("../regression-tests/named.confx"), PDNSException); + BP.setVerbose(true); + srcdir = std::getenv("SRCDIR"); + if (!srcdir) + srcdir = "."; // assume no shenanigans + + pathbuf << srcdir << "/../pdns/named.conf.parsertest"; + BP.parse(pathbuf.str()); + + vector domains = BP.getDomains(); + BOOST_CHECK_EQUAL(domains.size(), 11U); + +#define checkzone(i, dname, fname, ztype, nmasters) \ + { \ + BOOST_CHECK(domains[i].name == DNSName(dname)); \ + BOOST_CHECK_EQUAL(domains[i].filename, fname); \ + BOOST_CHECK_EQUAL(domains[i].type, #ztype); \ + BOOST_CHECK_EQUAL(domains[i].masters.size(), nmasters); \ + } + + checkzone(0, "example.com", "./zones//example.com", master, 0U); + checkzone(1, "test.com", "./zones//test.com", slave, 1U); + BOOST_CHECK_EQUAL(domains[1].masters[0].toString(), ComboAddress("1.2.3.4", 5678).toString()); + checkzone(2, "test.dyndns", "./zones//test.dyndns", garblewarble, 0U); + checkzone(3, "wtest.com", "./zones//wtest.com", master, 0U); + checkzone(4, "nztest.com", "./zones//nztest.com", master, 0U); + checkzone(5, "dnssec-parent.com", "./zones//dnssec-parent.com", master, 0U); + checkzone(6, "delegated.dnssec-parent.com", "./zones//delegated.dnssec-parent.com", master, 0U); + checkzone(7, "secure-delegated.dnssec-parent.com", "./zones//secure-delegated.dnssec-parent.com", master, 0U); + checkzone(8, "minimal.com", "./zones//minimal.com", master, 0U); + checkzone(9, "tsig.com", "./zones//tsig.com", master, 0U); + checkzone(10, "stest.com", "./zones//stest.com", master, 0U); } BOOST_AUTO_TEST_SUITE_END() - -- 2.39.2