build: update waf to version 2.0.6
Fix discovered build issues
Change-Id: I9a861c955283c1b20cc5065a4baa22bd7c2ab0c1
diff --git a/tests/test-common.hpp b/tests/test-common.hpp
index ef9c2de..04efefc 100644
--- a/tests/test-common.hpp
+++ b/tests/test-common.hpp
@@ -1,7 +1,8 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2017, The University of Memphis,
- * Regents of the University of California
+/*
+ * Copyright (c) 2014-2018, The University of Memphis,
+ * Regents of the University of California,
+ * Arizona Board of Regents.
*
* This file is part of NLSR (Named-data Link State Routing).
* See AUTHORS.md for complete list of NLSR authors and contributors.
@@ -16,8 +17,7 @@
*
* You should have received a copy of the GNU General Public License along with
* NLSR, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
- *
- **/
+ */
#ifndef NLSR_TEST_COMMON_HPP
#define NLSR_TEST_COMMON_HPP
@@ -92,6 +92,9 @@
public:
MockNfdMgmtFixture();
+ virtual
+ ~MockNfdMgmtFixture() = default;
+
/** \brief send one WireEncodable in reply to StatusDataset request
* \param prefix dataset prefix without version and segment
* \param payload payload block
diff --git a/tests/wscript b/tests/wscript
index a943f1e..de5a52c 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -1,7 +1,7 @@
# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
"""
-Copyright (c) 2014-2017, The University of Memphis
+Copyright (c) 2014-2018, The University of Memphis
Regents of the University of California
This file is part of NLSR (Named-data Link State Routing).
@@ -25,20 +25,13 @@
if not bld.env['WITH_TESTS']:
return
- bld(
- features='cxx',
- name='unit-tests-main',
- target='unit-tests-main',
- source='main.cpp',
- defines=['BOOST_TEST_MODULE=NLSR Unit Tests'],
- use='nlsr-objects'
- )
+ bld.objects(target='unit-test-objects',
+ source=bld.path.ant_glob('**/*.cpp', excl=['main.cpp']),
+ use='nlsr-objects')
- bld.program(
- target='../unit-tests-nlsr',
- features='cxx cxxprogram',
- source=bld.path.ant_glob(['**/*.cpp'], excl=['main.cpp']),
- use='nlsr-objects unit-tests-main',
- install_path=None,
- # defines='TEST_CONFIG_PATH=\"%s/conf-test\"' %(bld.bldnode)
- )
+ bld.program(target='../unit-tests-nlsr',
+ name='unit-tests-nlsr',
+ source='main.cpp',
+ defines=['BOOST_TEST_MODULE=NLSR Unit Tests'],
+ use='unit-test-objects',
+ install_path=None)