build: raise minimum build requirements
* Make gcc 7.4 and boost 1.65.1 hard dependencies, both are
available out-of-the-box on Ubuntu 18.04
* Require Xcode 10 on macOS but recommend 11.3 or later
* If using clang on non-Apple platforms, the minimum supported
version is now 6.0
Change-Id: I79c84a266741c9a66655da4fd467fe0d8218e8f0
diff --git a/tests/unit/util/indented-stream.t.cpp b/tests/unit/util/indented-stream.t.cpp
index f07990a..91da1e3 100644
--- a/tests/unit/util/indented-stream.t.cpp
+++ b/tests/unit/util/indented-stream.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2013-2019 Regents of the University of California.
+ * Copyright (c) 2013-2022 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -23,11 +23,7 @@
#include "tests/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 util {
diff --git a/tests/unit/util/logging.t.cpp b/tests/unit/util/logging.t.cpp
index 7daa1cd..821e11e 100644
--- a/tests/unit/util/logging.t.cpp
+++ b/tests/unit/util/logging.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2013-2021 Regents of the University of California.
+ * Copyright (c) 2013-2022 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -25,11 +25,7 @@
#include "tests/boost-test.hpp"
#include "tests/unit/clock-fixture.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 util {
diff --git a/tests/unit/util/ostream-joiner.t.cpp b/tests/unit/util/ostream-joiner.t.cpp
index 2eaf2f9..4c617fa 100644
--- a/tests/unit/util/ostream-joiner.t.cpp
+++ b/tests/unit/util/ostream-joiner.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2013-2020 Regents of the University of California.
+ * Copyright (c) 2013-2022 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -24,12 +24,7 @@
#include "tests/boost-test.hpp"
#include <numeric>
-
-#if BOOST_VERSION >= 105900
#include <boost/test/tools/output_test_stream.hpp>
-#else
-#include <boost/test/output_test_stream.hpp>
-#endif
namespace ndn {
namespace tests {
diff --git a/tests/unit/util/string-helper.t.cpp b/tests/unit/util/string-helper.t.cpp
index a129c1a..e3229e5 100644
--- a/tests/unit/util/string-helper.t.cpp
+++ b/tests/unit/util/string-helper.t.cpp
@@ -26,12 +26,7 @@
#include <cctype>
#include <cstring>
-
-#if BOOST_VERSION >= 105900
#include <boost/test/tools/output_test_stream.hpp>
-#else
-#include <boost/test/output_test_stream.hpp>
-#endif
namespace ndn {
namespace util {
diff --git a/tests/unit/version.t.cpp b/tests/unit/version.t.cpp
index a567695..ff3e32a 100644
--- a/tests/unit/version.t.cpp
+++ b/tests/unit/version.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2022 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -20,11 +20,10 @@
*/
#include "ndn-cxx/version.hpp"
-#include "ndn-cxx/detail/common.hpp"
#include "tests/boost-test.hpp"
-#include <stdio.h>
+#include <cstdio>
namespace ndn {
namespace tests {
@@ -33,25 +32,28 @@
BOOST_AUTO_TEST_CASE(VersionNumber)
{
- BOOST_TEST_MESSAGE("NDN_CXX_VERSION = " + to_string(NDN_CXX_VERSION));
+ BOOST_TEST_MESSAGE("NDN_CXX_VERSION = " << NDN_CXX_VERSION);
- BOOST_CHECK_EQUAL(NDN_CXX_VERSION, NDN_CXX_VERSION_MAJOR * 1000000 +
- NDN_CXX_VERSION_MINOR * 1000 +
- NDN_CXX_VERSION_PATCH);
+ BOOST_TEST(NDN_CXX_VERSION == NDN_CXX_VERSION_MAJOR * 1000000 +
+ NDN_CXX_VERSION_MINOR * 1000 +
+ NDN_CXX_VERSION_PATCH);
+
+ static_assert(NDN_CXX_VERSION_MAJOR < 1000, "");
+ static_assert(NDN_CXX_VERSION_MINOR < 1000, "");
+ static_assert(NDN_CXX_VERSION_PATCH < 1000, "");
}
BOOST_AUTO_TEST_CASE(VersionString)
{
BOOST_TEST_MESSAGE("NDN_CXX_VERSION_STRING = " NDN_CXX_VERSION_STRING);
+ BOOST_TEST_MESSAGE("NDN_CXX_VERSION_BUILD_STRING = " NDN_CXX_VERSION_BUILD_STRING);
- BOOST_STATIC_ASSERT(NDN_CXX_VERSION_MAJOR < 1000);
- BOOST_STATIC_ASSERT(NDN_CXX_VERSION_MINOR < 1000);
- BOOST_STATIC_ASSERT(NDN_CXX_VERSION_PATCH < 1000);
- char buf[12];
- ::snprintf(buf, sizeof(buf), "%d.%d.%d",
- NDN_CXX_VERSION_MAJOR, NDN_CXX_VERSION_MINOR, NDN_CXX_VERSION_PATCH);
+ char s[12];
+ std::snprintf(s, sizeof(s), "%d.%d.%d",
+ NDN_CXX_VERSION_MAJOR, NDN_CXX_VERSION_MINOR, NDN_CXX_VERSION_PATCH);
- BOOST_CHECK_EQUAL(NDN_CXX_VERSION_STRING, buf);
+ BOOST_TEST(NDN_CXX_VERSION_STRING == s);
+ BOOST_TEST(NDN_CXX_VERSION_BUILD_STRING != "");
}
BOOST_AUTO_TEST_SUITE_END() // TestVersion