build: align minimum build dependencies with ndn-cxx
* gcc 7.4
* clang 6.0
* Xcode 10.0 (11.3 or later recommended)
Also update waf to version 2.0.23
Change-Id: Ic8180b88df8c95c0d416ef308046f8e7ff79d26a
diff --git a/tests/global-configuration.cpp b/tests/global-configuration.cpp
index de38e0e..27c2a43 100644
--- a/tests/global-configuration.cpp
+++ b/tests/global-configuration.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2020, Regents of the University of California.
+ * Copyright (c) 2014-2022, Regents of the University of California.
*
* This file is part of NDNS (Named Data Networking Domain Name Service).
* See AUTHORS.md for complete list of NDNS authors and contributors.
@@ -68,13 +68,7 @@
std::string m_tpm;
};
-#if BOOST_VERSION >= 106500
BOOST_TEST_GLOBAL_CONFIGURATION(GlobalConfiguration);
-#elif BOOST_VERSION >= 105900
-BOOST_GLOBAL_FIXTURE(GlobalConfiguration);
-#else
-BOOST_GLOBAL_FIXTURE(GlobalConfiguration)
-#endif
} // namespace tests
} // namespace ndn
diff --git a/tests/unit/daemon/rrset.t.cpp b/tests/unit/daemon/rrset.t.cpp
index ed45bb9..4cda288 100644
--- a/tests/unit/daemon/rrset.t.cpp
+++ b/tests/unit/daemon/rrset.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2021, Regents of the University of California.
+ * Copyright (c) 2014-2022, Regents of the University of California.
*
* This file is part of NDNS (Named Data Networking Domain Name Service).
* See AUTHORS.md for complete list of NDNS authors and contributors.
@@ -21,11 +21,7 @@
#include "boost-test.hpp"
-#if BOOST_VERSION >= 105900
#include <boost/test/tools/output_test_stream.hpp>
-#else
-#include <boost/test/output_test_stream.hpp>
-#endif
namespace ndn {
namespace ndns {
diff --git a/tests/unit/daemon/zone.t.cpp b/tests/unit/daemon/zone.t.cpp
index ed57285..f492782 100644
--- a/tests/unit/daemon/zone.t.cpp
+++ b/tests/unit/daemon/zone.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2020, Regents of the University of California.
+ * Copyright (c) 2014-2022, Regents of the University of California.
*
* This file is part of NDNS (Named Data Networking Domain Name Service).
* See AUTHORS.md for complete list of NDNS authors and contributors.
@@ -21,11 +21,7 @@
#include "boost-test.hpp"
-#if BOOST_VERSION >= 105900
#include <boost/test/tools/output_test_stream.hpp>
-#else
-#include <boost/test/output_test_stream.hpp>
-#endif
namespace ndn {
namespace ndns {
diff --git a/tests/unit/mgmt/management-tool.t.cpp b/tests/unit/mgmt/management-tool.t.cpp
index 6a3d535..db2eaa0 100644
--- a/tests/unit/mgmt/management-tool.t.cpp
+++ b/tests/unit/mgmt/management-tool.t.cpp
@@ -30,11 +30,7 @@
#include <boost/algorithm/string/replace.hpp>
#include <boost/range/adaptors.hpp>
-#if BOOST_VERSION >= 105900
#include <boost/test/tools/output_test_stream.hpp>
-#else
-#include <boost/test/output_test_stream.hpp>
-#endif
#include <ndn-cxx/security/transform.hpp>
#include <ndn-cxx/util/io.hpp>
@@ -753,7 +749,7 @@
BOOST_AUTO_TEST_CASE(AddRrSetDskCertUserProvidedCert)
{
- //check using user provided certificate
+ // check using user provided certificate
Name parentZoneName("/ndns-test");
Name parentZoneIdentityName = Name(parentZoneName).append(label::NDNS_ITERATIVE_QUERY);
Name zoneName("/ndns-test/child-zone");
@@ -778,7 +774,7 @@
BOOST_AUTO_TEST_CASE(AddRrSetDskCertInvalidOutput)
{
- //check invalid output
+ // check invalid output
Name parentZoneName("/ndns-test");
Name zoneName = Name(parentZoneName).append("child-zone");
m_tool.createZone(zoneName, parentZoneName);
@@ -792,7 +788,7 @@
BOOST_AUTO_TEST_CASE(AddRrSetVersionControl)
{
- //check version control
+ // check version control
time::seconds ttl(4200);
Name parentZoneName("/ndns-test");
Name zoneName = Name(parentZoneName).append("child-zone");
@@ -834,7 +830,7 @@
BOOST_AUTO_TEST_CASE(AddRrSetDskCertFormat)
{
- //check input with different formats
+ // check input with different formats
Name parentZoneName("/ndns-test");
Name zoneName = Name(parentZoneName).append("child-zone");
Zone parentZone(parentZoneName);