You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jp...@apache.org on 2018/06/30 11:44:16 UTC
[1/2] mesos git commit: Moved tests sources from libmesos to
mesos-tests.
Repository: mesos
Updated Branches:
refs/heads/master e16e4cd8a -> 397633c83
Moved tests sources from libmesos to mesos-tests.
Since libmesos should not contain any tests, move test
headers into `mesos_tests_SOURCES`.
Review: https://reviews.apache.org/r/67792/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/41985f09
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/41985f09
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/41985f09
Branch: refs/heads/master
Commit: 41985f0967ed23b14bc2947924015645e6300007
Parents: e16e4cd
Author: James Peach <jp...@apache.org>
Authored: Sat Jun 30 21:43:14 2018 +1000
Committer: James Peach <jp...@apache.org>
Committed: Sat Jun 30 21:43:14 2018 +1000
----------------------------------------------------------------------
src/Makefile.am | 72 ++++++++++++++++++++++++++--------------------------
1 file changed, 36 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/41985f09/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index bd94a64..76f61d8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1257,7 +1257,7 @@ libmesos_no_3rdparty_la_SOURCES += \
slave/containerizer/mesos/provisioner/appc/paths.hpp \
slave/containerizer/mesos/provisioner/appc/store.hpp \
slave/containerizer/mesos/provisioner/backends/copy.hpp \
- slave/containerizer/mesos/provisioner/docker/image_tar_puller.hpp \
+ slave/containerizer/mesos/provisioner/docker/image_tar_puller.hpp \
slave/containerizer/mesos/provisioner/docker/message.hpp \
slave/containerizer/mesos/provisioner/docker/metadata_manager.hpp \
slave/containerizer/mesos/provisioner/docker/paths.hpp \
@@ -1268,36 +1268,6 @@ libmesos_no_3rdparty_la_SOURCES += \
slave/resource_estimators/noop.hpp \
status_update_manager/status_update_manager_process.hpp \
status_update_manager/operation.hpp \
- tests/active_user_test_helper.hpp \
- tests/allocator.hpp \
- tests/cluster.hpp \
- tests/containerizer.hpp \
- tests/environment.hpp \
- tests/flags.hpp \
- tests/http_server_test_helper.hpp \
- tests/kill_policy_test_helper.hpp \
- tests/limiter.hpp \
- tests/mesos.hpp \
- tests/mock_docker.hpp \
- tests/mock_fetcher.hpp \
- tests/mock_slave.hpp \
- tests/mock_registrar.hpp \
- tests/module.hpp \
- tests/resources_utils.hpp \
- tests/script.hpp \
- tests/utils.hpp \
- tests/zookeeper.hpp \
- tests/zookeeper_test_server.hpp \
- tests/containerizer/capabilities_test_helper.hpp \
- tests/containerizer/docker_archive.hpp \
- tests/containerizer/docker_common.hpp \
- tests/containerizer/isolator.hpp \
- tests/containerizer/launcher.hpp \
- tests/containerizer/memory_test_helper.hpp \
- tests/containerizer/mock_containerizer.hpp \
- tests/containerizer/rootfs.hpp \
- tests/containerizer/setns_test_helper.hpp \
- tests/containerizer/store.hpp \
uri/fetcher.hpp \
uri/utils.hpp \
uri/fetchers/copy.hpp \
@@ -2514,7 +2484,9 @@ endif
mesos_tests_SOURCES = \
slave/qos_controllers/load.cpp \
tests/active_user_test_helper.cpp \
+ tests/active_user_test_helper.hpp \
tests/agent_container_api_tests.cpp \
+ tests/allocator.hpp \
tests/anonymous_tests.cpp \
tests/api_tests.cpp \
tests/attributes_tests.cpp \
@@ -2522,11 +2494,13 @@ mesos_tests_SOURCES = \
tests/authorization_tests.cpp \
tests/check_tests.cpp \
tests/cluster.cpp \
+ tests/cluster.hpp \
tests/command_executor_tests.cpp \
tests/common_validation_tests.cpp \
+ tests/container_daemon_tests.cpp \
tests/container_logger_tests.cpp \
tests/containerizer.cpp \
- tests/container_daemon_tests.cpp \
+ tests/containerizer.hpp \
tests/cram_md5_authentication_tests.cpp \
tests/credentials_tests.cpp \
tests/default_executor_tests.cpp \
@@ -2534,6 +2508,7 @@ mesos_tests_SOURCES = \
tests/disk_quota_tests.cpp \
tests/dynamic_weights_tests.cpp \
tests/environment.cpp \
+ tests/environment.hpp \
tests/examples_tests.cpp \
tests/exception_tests.cpp \
tests/executor_http_api_tests.cpp \
@@ -2542,6 +2517,7 @@ mesos_tests_SOURCES = \
tests/fetcher_tests.cpp \
tests/files_tests.cpp \
tests/flags.cpp \
+ tests/flags.hpp \
tests/gc_tests.cpp \
tests/hdfs_tests.cpp \
tests/health_check_tests.cpp \
@@ -2550,7 +2526,10 @@ mesos_tests_SOURCES = \
tests/http_authentication_tests.cpp \
tests/http_fault_tolerance_tests.cpp \
tests/http_server_test_helper.cpp \
+ tests/http_server_test_helper.hpp \
tests/kill_policy_test_helper.cpp \
+ tests/kill_policy_test_helper.hpp \
+ tests/limiter.hpp \
tests/log_tests.cpp \
tests/logging_tests.cpp \
tests/main.cpp \
@@ -2564,12 +2543,18 @@ mesos_tests_SOURCES = \
tests/master_tests.cpp \
tests/master_validation_tests.cpp \
tests/mesos.cpp \
+ tests/mesos.hpp \
tests/metrics_tests.cpp \
tests/mock_docker.cpp \
+ tests/mock_docker.hpp \
tests/mock_fetcher.cpp \
- tests/mock_slave.cpp \
+ tests/mock_fetcher.hpp \
tests/mock_registrar.cpp \
+ tests/mock_registrar.hpp \
+ tests/mock_slave.cpp \
+ tests/mock_slave.hpp \
tests/module.cpp \
+ tests/module.hpp \
tests/module_tests.cpp \
tests/operation_reconciliation_tests.cpp \
tests/operation_status_update_manager_tests.cpp \
@@ -2590,52 +2575,67 @@ mesos_tests_SOURCES = \
tests/resource_provider_validation_tests.cpp \
tests/resources_tests.cpp \
tests/resources_utils.cpp \
+ tests/resources_utils.hpp \
tests/role_tests.cpp \
tests/scheduler_driver_tests.cpp \
tests/scheduler_event_call_tests.cpp \
tests/scheduler_http_api_tests.cpp \
tests/scheduler_tests.cpp \
tests/script.cpp \
+ tests/script.hpp \
tests/slave_authorization_tests.cpp \
tests/slave_compatibility_tests.cpp \
tests/slave_recovery_tests.cpp \
- tests/slave_validation_tests.cpp \
tests/slave_tests.cpp \
+ tests/slave_validation_tests.cpp \
tests/sorter_tests.cpp \
tests/state_tests.cpp \
tests/task_status_update_manager_tests.cpp \
tests/teardown_tests.cpp \
tests/upgrade_tests.cpp \
- tests/uri_tests.cpp \
tests/uri_fetcher_tests.cpp \
+ tests/uri_tests.cpp \
tests/utils.cpp \
+ tests/utils.hpp \
tests/values_tests.cpp \
+ tests/zookeeper.hpp \
+ tests/zookeeper_test_server.hpp \
tests/zookeeper_url_tests.cpp \
tests/common/command_utils_tests.cpp \
tests/common/http_tests.cpp \
tests/common/recordio_tests.cpp \
tests/common/type_utils_tests.cpp \
tests/containerizer/appc_spec_tests.cpp \
+ tests/containerizer/capabilities_test_helper.hpp \
tests/containerizer/composing_containerizer_tests.cpp \
tests/containerizer/containerizer_tests.cpp \
tests/containerizer/cpu_isolator_tests.cpp \
+ tests/containerizer/docker_archive.hpp \
+ tests/containerizer/docker_common.hpp \
tests/containerizer/docker_containerizer_tests.cpp \
tests/containerizer/docker_spec_tests.cpp \
tests/containerizer/docker_tests.cpp \
tests/containerizer/environment_secret_isolator_tests.cpp \
tests/containerizer/io_switchboard_tests.cpp \
+ tests/containerizer/isolator.hpp \
tests/containerizer/isolator_tests.cpp \
tests/containerizer/launcher.cpp \
+ tests/containerizer/launcher.hpp \
tests/containerizer/memory_isolator_tests.cpp \
tests/containerizer/memory_test_helper.cpp \
- tests/containerizer/mesos_containerizer_tests.cpp \
+ tests/containerizer/memory_test_helper.hpp \
tests/containerizer/mesos_containerizer_paths_tests.cpp \
+ tests/containerizer/mesos_containerizer_tests.cpp \
+ tests/containerizer/mock_containerizer.hpp \
tests/containerizer/oci_spec_tests.cpp \
tests/containerizer/posix_rlimits_isolator_tests.cpp \
tests/containerizer/provisioner_appc_tests.cpp \
tests/containerizer/provisioner_backend_tests.cpp \
tests/containerizer/provisioner_docker_tests.cpp \
tests/containerizer/provisioner_paths_tests.cpp \
+ tests/containerizer/rootfs.hpp \
+ tests/containerizer/setns_test_helper.hpp \
+ tests/containerizer/store.hpp \
tests/containerizer/volume_sandbox_path_isolator_tests.cpp
if ENABLE_GRPC
[2/2] mesos git commit: Combined headers and sources in
`MESOS_LINUX_FILES`.
Posted by jp...@apache.org.
Combined headers and sources in `MESOS_LINUX_FILES`.
The autotools build doesn't have a general style of separating
header and source files into separate build variables, so combine
both into the same `MESOS_LINUX_FILES` addition to make the style
more consistent.
Review: https://reviews.apache.org/r/67793/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/397633c8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/397633c8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/397633c8
Branch: refs/heads/master
Commit: 397633c830855429bbb2d250114ed3974b924ce4
Parents: 41985f0
Author: James Peach <jp...@apache.org>
Authored: Sat Jun 30 21:43:25 2018 +1000
Committer: James Peach <jp...@apache.org>
Committed: Sat Jun 30 21:43:25 2018 +1000
----------------------------------------------------------------------
src/Makefile.am | 86 +++++++++++++++++++++++++---------------------------
1 file changed, 42 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/397633c8/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 76f61d8..de80820 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1285,96 +1285,94 @@ libmesos_no_3rdparty_la_SOURCES += \
MESOS_LINUX_FILES = \
linux/capabilities.cpp \
- linux/cgroups.cpp \
- linux/fs.cpp \
- linux/ldcache.cpp \
- linux/ldd.cpp \
- linux/ns.cpp \
- linux/perf.cpp \
- linux/systemd.cpp \
- slave/containerizer/mesos/linux_launcher.cpp \
- slave/containerizer/mesos/isolators/appc/runtime.cpp \
- slave/containerizer/mesos/isolators/cgroups/cgroups.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystem.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/blkio.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/cpu.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/cpuacct.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/cpuset.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/devices.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/hugetlb.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/memory.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/net_prio.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/perf_event.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/pids.cpp \
- slave/containerizer/mesos/isolators/docker/runtime.cpp \
- slave/containerizer/mesos/isolators/docker/volume/isolator.cpp \
- slave/containerizer/mesos/isolators/filesystem/linux.cpp \
- slave/containerizer/mesos/isolators/filesystem/shared.cpp \
- slave/containerizer/mesos/isolators/gpu/allocator.cpp \
- slave/containerizer/mesos/isolators/gpu/isolator.cpp \
- slave/containerizer/mesos/isolators/gpu/nvml.cpp \
- slave/containerizer/mesos/isolators/gpu/volume.cpp \
- slave/containerizer/mesos/isolators/linux/capabilities.cpp \
- slave/containerizer/mesos/isolators/linux/devices.cpp \
- slave/containerizer/mesos/isolators/namespaces/ipc.cpp \
- slave/containerizer/mesos/isolators/namespaces/pid.cpp \
- slave/containerizer/mesos/isolators/network/cni/cni.cpp \
- slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp \
- slave/containerizer/mesos/isolators/volume/host_path.cpp \
- slave/containerizer/mesos/isolators/volume/image.cpp \
- slave/containerizer/mesos/isolators/volume/secret.cpp \
- slave/containerizer/mesos/provisioner/backends/aufs.cpp \
- slave/containerizer/mesos/provisioner/backends/bind.cpp \
- slave/containerizer/mesos/provisioner/backends/overlay.cpp
-
-MESOS_LINUX_FILES += \
linux/capabilities.hpp \
+ linux/cgroups.cpp \
linux/cgroups.hpp \
+ linux/fs.cpp \
linux/fs.hpp \
+ linux/ldcache.cpp \
linux/ldcache.hpp \
+ linux/ldd.cpp \
linux/ldd.hpp \
+ linux/ns.cpp \
linux/ns.hpp \
+ linux/perf.cpp \
linux/perf.hpp \
linux/sched.hpp \
+ linux/systemd.cpp \
linux/systemd.hpp \
+ slave/containerizer/mesos/linux_launcher.cpp \
slave/containerizer/mesos/linux_launcher.hpp \
+ slave/containerizer/mesos/isolators/appc/runtime.cpp \
slave/containerizer/mesos/isolators/appc/runtime.hpp \
+ slave/containerizer/mesos/isolators/cgroups/cgroups.cpp \
slave/containerizer/mesos/isolators/cgroups/cgroups.hpp \
slave/containerizer/mesos/isolators/cgroups/constants.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystem.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystem.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/blkio.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/blkio.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/cpu.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/cpu.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/cpuacct.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/cpuacct.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/cpuset.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/cpuset.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/devices.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/devices.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/hugetlb.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/hugetlb.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/memory.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/memory.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/net_prio.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/net_prio.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/perf_event.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/perf_event.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/pids.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/pids.hpp \
+ slave/containerizer/mesos/isolators/docker/runtime.cpp \
slave/containerizer/mesos/isolators/docker/runtime.hpp \
+ slave/containerizer/mesos/isolators/docker/volume/isolator.cpp \
slave/containerizer/mesos/isolators/docker/volume/isolator.hpp \
+ slave/containerizer/mesos/isolators/filesystem/linux.cpp \
slave/containerizer/mesos/isolators/filesystem/linux.hpp \
+ slave/containerizer/mesos/isolators/filesystem/shared.cpp \
slave/containerizer/mesos/isolators/filesystem/shared.hpp \
+ slave/containerizer/mesos/isolators/gpu/allocator.cpp \
slave/containerizer/mesos/isolators/gpu/allocator.hpp \
slave/containerizer/mesos/isolators/gpu/components.hpp \
+ slave/containerizer/mesos/isolators/gpu/isolator.cpp \
slave/containerizer/mesos/isolators/gpu/isolator.hpp \
slave/containerizer/mesos/isolators/gpu/nvidia.hpp \
+ slave/containerizer/mesos/isolators/gpu/nvml.cpp \
slave/containerizer/mesos/isolators/gpu/nvml.hpp \
+ slave/containerizer/mesos/isolators/gpu/volume.cpp \
slave/containerizer/mesos/isolators/gpu/volume.hpp \
+ slave/containerizer/mesos/isolators/linux/capabilities.cpp \
slave/containerizer/mesos/isolators/linux/capabilities.hpp \
+ slave/containerizer/mesos/isolators/linux/devices.cpp \
slave/containerizer/mesos/isolators/linux/devices.hpp \
+ slave/containerizer/mesos/isolators/namespaces/ipc.cpp \
slave/containerizer/mesos/isolators/namespaces/ipc.hpp \
+ slave/containerizer/mesos/isolators/namespaces/pid.cpp \
slave/containerizer/mesos/isolators/namespaces/pid.hpp \
+ slave/containerizer/mesos/isolators/network/cni/cni.cpp \
slave/containerizer/mesos/isolators/network/cni/cni.hpp \
+ slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp \
slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.hpp \
+ slave/containerizer/mesos/isolators/volume/host_path.cpp \
slave/containerizer/mesos/isolators/volume/host_path.hpp \
+ slave/containerizer/mesos/isolators/volume/image.cpp \
slave/containerizer/mesos/isolators/volume/image.hpp \
+ slave/containerizer/mesos/isolators/volume/secret.cpp \
slave/containerizer/mesos/isolators/volume/secret.hpp \
+ slave/containerizer/mesos/provisioner/backends/aufs.cpp \
slave/containerizer/mesos/provisioner/backends/aufs.hpp \
+ slave/containerizer/mesos/provisioner/backends/bind.cpp \
slave/containerizer/mesos/provisioner/backends/bind.hpp \
+ slave/containerizer/mesos/provisioner/backends/overlay.cpp \
slave/containerizer/mesos/provisioner/backends/overlay.hpp
if ENABLE_XFS_DISK_ISOLATOR