2
0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-22 01:49:48 +00:00

[#3919] Fix some TODOs related to autotools removal

This commit is contained in:
Andrei Pavel 2025-06-20 00:47:44 +03:00
parent 39c1db1b73
commit 8f20f834b0
No known key found for this signature in database
GPG Key ID: D4E804481939CB21
5 changed files with 3 additions and 16 deletions

View File

@ -1,4 +1,4 @@
// Copyright (C) 2023 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2023-2025 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this

View File

@ -37,11 +37,6 @@ main(int, char* argv[]) {
// Determine some paths.
Path const this_binary(argv[0]);
string ancestor_path(this_binary.parentPath());
// TODO: remove kludgy if-condition when autotools are removed.
if (Path(ancestor_path).filename() == ".libs") {
ancestor_path = Path(ancestor_path).parentPath();
}
cout << ancestor_path << endl;
string const filename(this_binary.filename());
stringstream ss;
ss << ancestor_path << "/input/" << filename;

View File

@ -1006,7 +1006,6 @@ CONFIG_REPORT = configure_file(
command: [TOP_BUILD_DIR / 'config-report.sh'],
)
# TODO: Change to config.h.in when autotools are removed.
configure_file(
input: 'config.h.in',
output: 'config.h',
@ -1015,7 +1014,6 @@ configure_file(
install_dir: INCLUDEDIR / 'kea',
)
# TODO: Change to kea_version.h.in when autotools are removed.
configure_file(
input: 'kea_version.h.in',
output: 'kea_version.h',

View File

@ -251,8 +251,8 @@ void LoggerManagerImpl::initRootLogger(isc::log::Severity severity,
{
log4cplus::Logger::getDefaultHierarchy().resetConfiguration();
// Disable log4cplus' own logging, unless --enable-debug was
// specified to configure. Note that this does not change
// Disable log4cplus' own logging, unless "-D tests=enabled" was
// pass to "meson setup". Note that this does not change
// LogLog's levels (that is still just INFO).
#ifndef ENABLE_DEBUG
log4cplus::helpers::LogLog::getLogLog()->setQuietMode(true);

View File

@ -14,12 +14,6 @@ set -eu
# Add an entry to the XML test report.
report_test_result_in_xml() {
# TODO: Remove this if-statemenet when autotools are removed.
if test ! -d "@TOP_BUILD_DIR@"; then
# There is nowhere to report.
return
fi
# Declarations
local test_name="${1}"; shift
local exit_code="${1}"; shift