diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2017-06-06 10:09:33 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2017-06-06 10:11:10 -0700 |
| commit | 9d02ca813fb73c878bef7dd706e6f2cd1e4564c8 (patch) | |
| tree | e724274a0a8bf88fc032ad88c7f5515227cd3de0 | |
| parent | f2fa27393c59ec00cd4057e5ef2514dbfda3611b (diff) | |
| parent | 4bc9219dee97713d141d76ecb33be358420a1b91 (diff) | |
| download | extras-9d02ca813fb73c878bef7dd706e6f2cd1e4564c8.tar.gz | |
resolve merge conflicts of 4bc9219d to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: 37753761
Change-Id: I4898abc8dd63fdfb4c4ca8a6e69a6198c4882cb3
| -rw-r--r-- | tests/kernel.config/Android.mk | 5 | ||||
| -rw-r--r-- | tests/kernel.config/nfs_test.cpp | 28 |
2 files changed, 32 insertions, 1 deletions
diff --git a/tests/kernel.config/Android.mk b/tests/kernel.config/Android.mk index 9be5d9d0..0c87107f 100644 --- a/tests/kernel.config/Android.mk +++ b/tests/kernel.config/Android.mk @@ -15,10 +15,11 @@ test_c_flags := \ # Required Tests cts_src_files := \ + logger_test.cpp \ multicast_test.cpp \ + nfs_test.cpp \ pstore_test.cpp \ sysvipc_test.cpp \ - logger_test.cpp # Required plus Recommended Tests # TODO: move aslr_test.cpp back to cts_src_files b/36888825 @@ -34,6 +35,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_CFLAGS := $(test_c_flags) LOCAL_CFLAGS := -DHAS_KCMP LOCAL_SRC_FILES := $(test_src_files) +LOCAL_SHARED_LIBRARIES := libbase include $(BUILD_NATIVE_TEST) include $(CLEAR_VARS) @@ -46,6 +48,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativetest LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 +LOCAL_SHARED_LIBRARIES := libbase LOCAL_STATIC_LIBRARIES := libgtest libgtest_main LOCAL_COMPATIBILITY_SUITE := cts diff --git a/tests/kernel.config/nfs_test.cpp b/tests/kernel.config/nfs_test.cpp new file mode 100644 index 00000000..01b45a74 --- /dev/null +++ b/tests/kernel.config/nfs_test.cpp @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <string> + +#include <android-base/file.h> +#include <gtest/gtest.h> + +TEST(kernel_config, NOT_CONFIG_NFS_) { + std::string fs; + EXPECT_TRUE(android::base::ReadFileToString("/proc/filesystems", &fs)); + EXPECT_TRUE(fs.find("\tnfs\n") == std::string::npos); + EXPECT_TRUE(fs.find("\tnfs4\n") == std::string::npos); + EXPECT_TRUE(fs.find("\tnfsd\n") == std::string::npos); +} |