Rearrange features
The backends are different things compared to generic code. Today,
these are all included in the /include folder, but it's not very clear
what options control which backends, or how things map together. This
also means that we can't separate ownership between the various
companies.
This commit is a proposal to try to create a features folder,
separated by the code for the various backends, to make interacting
with this easier. It takes the form
features/<option name>/files.hpp
features/<option name>/files_test.hpp
Note, redfish-core was already at top level, and contains lots of code,
so to prevent lots of conflicts, it's simply symlinked into that folder
to make clear that it is a backend, but not to move the implementation
and cause code conflicts.
Tested: Unit tests pass. Code compiles.
Change-Id: Idcc80ffcfd99c876734ee41d53f894ca5583fed5
Signed-off-by: Ed Tanous <etanous@nvidia.com>
diff --git a/meson.build b/meson.build
index d24437d..e92821f 100644
--- a/meson.build
+++ b/meson.build
@@ -57,13 +57,15 @@
endif
# Include Directories
+incdir = [
+ include_directories(
+ 'include',
+ 'redfish-core/include',
+ 'redfish-core/lib',
+ 'http',
+ ),
+]
-incdir = include_directories(
- 'include',
- 'redfish-core/include',
- 'redfish-core/lib',
- 'http',
-)
incdir_cli = include_directories('http', 'include')
# Add compiler arguments
@@ -371,6 +373,9 @@
bmcweb_dependencies += conf_h_dep
bmcweb_cli_dependencies += conf_h_dep
+test_sources = []
+subdir('features')
+
# Source files
fs = import('fs')
@@ -449,13 +454,10 @@
'test/include/async_resolve_test.cpp',
'test/include/credential_pipe_test.cpp',
'test/include/dbus_utility_test.cpp',
- 'test/include/google/google_service_root_test.cpp',
'test/include/http_utility_test.cpp',
'test/include/human_sort_test.cpp',
- 'test/include/ibm/configfile_test.cpp',
'test/include/json_html_serializer.cpp',
'test/include/multipart_test.cpp',
- 'test/include/openbmc_dbus_rest_test.cpp',
'test/include/ossl_random.cpp',
'test/include/sessions_test.cpp',
'test/include/ssl_key_handler_test.cpp',
@@ -491,7 +493,7 @@
'test/redfish-core/lib/systems_logservices_postcode.cpp',
'test/redfish-core/lib/thermal_subsystem_test.cpp',
'test/redfish-core/lib/update_service_test.cpp',
-)
+) + test_sources
if (get_option('tests').allowed())
gtest = dependency(