From 9449236cf7bf48f40b696edce68d81410d713489 Mon Sep 17 00:00:00 2001 From: Martin Braun <martin.braun@ettus.com> Date: Sun, 7 Oct 2018 13:30:35 -0700 Subject: modtool: OOTs use Boost.UTF, CMake 3.8-Aware - This is the same change that happened for the GNU Radio core - New OOTs will now have Boost.UTF-based unit tests - modtool will be able to handle both CppUnit-based OOTs as well as Boost.UTF-based ones; this change is backward-compatible --- gr-utils/python/modtool/modtool_rm.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gr-utils/python/modtool/modtool_rm.py') diff --git a/gr-utils/python/modtool/modtool_rm.py b/gr-utils/python/modtool/modtool_rm.py index 7395c99bea..55598a5090 100644 --- a/gr-utils/python/modtool/modtool_rm.py +++ b/gr-utils/python/modtool/modtool_rm.py @@ -80,6 +80,13 @@ class ModToolRemove(ModTool): r'\$\{CMAKE_CURRENT_SOURCE_DIR\}/%s' % filename, to_ignore_start='APPEND test_%s_sources' % self._info['modname']) self.scm.mark_file_updated(ed.filename) + elif self._info['version'] == '38': + (base, ext) = os.path.splitext(filename) + if ext == '.cc': + ed.remove_value( + 'list', filename, + to_ignore_start='APPEND test_%s_sources' % self._info['modname']) + self.scm.mark_file_updated(ed.filename) else: filebase = os.path.splitext(filename)[0] ed.delete_entry('add_executable', filebase) -- cgit v1.2.3