From c25aea49f2eca58b01c6b5b95bc6830b5c784a44 Mon Sep 17 00:00:00 2001 From: Alexey Serbin Date: Fri, 4 Nov 2016 23:09:04 -0700 Subject: [PATCH] [security] moved mini_kdc into the test subdir Moved mini_kdc code into the test sub-directory. The idea of moving is inspired by Todd's comment on https://gerrit.cloudera.org/#/c/4926/ There are no functional changes in this patch. Change-Id: I5f678f59e1911fd89191bd9b5dfb840e20d746a1 Reviewed-on: http://gerrit.cloudera.org:8080/4965 Tested-by: Kudu Jenkins Reviewed-by: Will Berkeley --- src/kudu/integration-tests/external_mini_cluster-test.cc | 2 +- src/kudu/integration-tests/external_mini_cluster.cc | 2 +- src/kudu/rpc/sasl_rpc-test.cc | 2 +- src/kudu/security/CMakeLists.txt | 4 ++-- src/kudu/security/{ => test}/mini_kdc-test.cc | 2 +- src/kudu/security/{ => test}/mini_kdc.cc | 2 +- src/kudu/security/{ => test}/mini_kdc.h | 0 7 files changed, 7 insertions(+), 7 deletions(-) rename src/kudu/security/{ => test}/mini_kdc-test.cc (98%) rename src/kudu/security/{ => test}/mini_kdc.cc (99%) rename src/kudu/security/{ => test}/mini_kdc.h (100%) diff --git a/src/kudu/integration-tests/external_mini_cluster-test.cc b/src/kudu/integration-tests/external_mini_cluster-test.cc index fbc63caa6a..f31675452c 100644 --- a/src/kudu/integration-tests/external_mini_cluster-test.cc +++ b/src/kudu/integration-tests/external_mini_cluster-test.cc @@ -27,7 +27,7 @@ #include "kudu/gutil/stl_util.h" #include "kudu/gutil/strings/substitute.h" #include "kudu/gutil/strings/util.h" -#include "kudu/security/mini_kdc.h" +#include "kudu/security/test/mini_kdc.h" #include "kudu/util/metrics.h" #include "kudu/util/net/net_util.h" #include "kudu/util/test_util.h" diff --git a/src/kudu/integration-tests/external_mini_cluster.cc b/src/kudu/integration-tests/external_mini_cluster.cc index 4e4420a301..621c0592b0 100644 --- a/src/kudu/integration-tests/external_mini_cluster.cc +++ b/src/kudu/integration-tests/external_mini_cluster.cc @@ -32,7 +32,7 @@ #include "kudu/gutil/strings/util.h" #include "kudu/master/master.proxy.h" #include "kudu/master/master_rpc.h" -#include "kudu/security/mini_kdc.h" +#include "kudu/security/test/mini_kdc.h" #include "kudu/server/server_base.pb.h" #include "kudu/server/server_base.proxy.h" #include "kudu/tserver/tserver_service.proxy.h" diff --git a/src/kudu/rpc/sasl_rpc-test.cc b/src/kudu/rpc/sasl_rpc-test.cc index 5861f7b3b6..1a5de40789 100644 --- a/src/kudu/rpc/sasl_rpc-test.cc +++ b/src/kudu/rpc/sasl_rpc-test.cc @@ -34,7 +34,7 @@ #include "kudu/rpc/sasl_client.h" #include "kudu/rpc/sasl_common.h" #include "kudu/rpc/sasl_server.h" -#include "kudu/security/mini_kdc.h" +#include "kudu/security/test/mini_kdc.h" #include "kudu/util/monotime.h" #include "kudu/util/net/sockaddr.h" #include "kudu/util/net/socket.h" diff --git a/src/kudu/security/CMakeLists.txt b/src/kudu/security/CMakeLists.txt index 3386f3e75e..28a954331d 100644 --- a/src/kudu/security/CMakeLists.txt +++ b/src/kudu/security/CMakeLists.txt @@ -16,7 +16,7 @@ # under the License. set(SECURITY_TEST_SRCS - mini_kdc.cc + test/mini_kdc.cc ) add_library(security-test ${SECURITY_TEST_SRCS}) @@ -30,4 +30,4 @@ set(KUDU_TEST_LINK_LIBS security-test ${KUDU_MIN_TEST_LIBS}) -ADD_KUDU_TEST(mini_kdc-test) +ADD_KUDU_TEST(test/mini_kdc-test) diff --git a/src/kudu/security/mini_kdc-test.cc b/src/kudu/security/test/mini_kdc-test.cc similarity index 98% rename from src/kudu/security/mini_kdc-test.cc rename to src/kudu/security/test/mini_kdc-test.cc index 66fcb4cb23..3c5734084b 100644 --- a/src/kudu/security/mini_kdc-test.cc +++ b/src/kudu/security/test/mini_kdc-test.cc @@ -19,7 +19,7 @@ #include -#include "kudu/security/mini_kdc.h" +#include "kudu/security/test/mini_kdc.h" #include "kudu/util/env.h" #include "kudu/util/test_util.h" diff --git a/src/kudu/security/mini_kdc.cc b/src/kudu/security/test/mini_kdc.cc similarity index 99% rename from src/kudu/security/mini_kdc.cc rename to src/kudu/security/test/mini_kdc.cc index 8cb73eb8c4..8e92080cb2 100644 --- a/src/kudu/security/mini_kdc.cc +++ b/src/kudu/security/test/mini_kdc.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "kudu/security/mini_kdc.h" +#include "kudu/security/test/mini_kdc.h" #include #include diff --git a/src/kudu/security/mini_kdc.h b/src/kudu/security/test/mini_kdc.h similarity index 100% rename from src/kudu/security/mini_kdc.h rename to src/kudu/security/test/mini_kdc.h