!3575 OH3.1Release分支Capability&DAC测试套删除jffs2文件系统、开发板相关的用例

Merge pull request !3575 from 胡吉翔/liteOS_20220616

security_lite/permission_posix/capability/BUILD.gn

@@ -12,10 +12,7 @@
 # limitations under the License.
 
 group("ActsCapabilityTest") {
-  deps = [
-    "./jffs:ActsJFFS2CapabilityTest",
-    "./vfat:ActsVFATCapabilityTest",
-  ]
+  deps = [ "./vfat:ActsVFATCapabilityTest" ]
 }
 
 shared_library("capability_shared") {

security_lite/permission_posix/capability/jffs/BUILD.gn

-# Copyright (c) 2021 Huawei Device Co., Ltd.
-# 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.
-
-import("//build/lite/config/subsystem/aafwk/config.gni")
-import("//test/xts/tools/lite/build/suite_lite.gni")
-
-hcpptest_suite("ActsJFFS2CapabilityTest") {
-  suite_name = "acts"
-  sources = [
-    "../src/ActsCapability.cpp",
-    "../src/ActsCapabilityTest.cpp",
-    "../src/CapabilityFileSystemTest.cpp",
-  ]
-
-  include_dirs = [
-    "../src",
-    "//third_party/bounds_checking_function/include",
-  ]
-
-  public_deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-
-  cflags_cc = [
-    "-Wno-write-strings",
-    "-Wno-sign-compare",
-  ]
-
-  ldflags = [
-    "-lstdc++",
-    "-lm",
-    "-lpthread",
-  ]
-
-  if (enable_ohos_appexecfwk_feature_ability == true) {
-    defines = [
-      "_BOARD_HI3516_",
-      "LITE_FS_JFFS2",
-      "TOP_DIR=\"/storage\"",
-      "TOP_DIR_MOUNT_INFO=\"/storage jffs\"",
-    ]
-  } else {
-    defines = [
-      "LITE_FS_JFFS2",
-      "TOP_DIR=\"/storage\"",
-      "TOP_DIR_MOUNT_INFO=\"/storage jffs\"",
-    ]
-  }
-}

security_lite/permission_posix/capability/jffs/Test.json

-{
-    "description": "Config for hcpptest demo test cases",
-    "environment": [
-        {
-            "type": "device",
-            "label": "ipcamera"
-        }
-    ],
-    "kits": [
-        {
-            "type": "MountKit",
-            "server": "NfsServer",
-            "mount": [
-                {
-                    "source": "testcases/security",
-                    "target": "/test_root/security"
-                }
-            ]
-        }
-    ],
-    "driver": {
-        "type": "CppTestLite",
-        "execute": "/test_root/security/ActsJFFS2CapabilityTest.bin"
-    }
-}
\ No newline at end of file

security_lite/permission_posix/capability/vfat/BUILD.gn

@@ -42,7 +42,6 @@ hcpptest_suite("ActsVFATCapabilityTest") {
 
   if (enable_ohos_appexecfwk_feature_ability == true) {
     defines = [
-      "_BOARD_HI3516_",
       "LITE_FS_VFAT",
       "TOP_DIR=\"/sdcard\"",
       "TOP_DIR_MOUNT_INFO=\"/sdcard vfat\"",

security_lite/permission_posix/dac/BUILD.gn

@@ -12,8 +12,5 @@
 # limitations under the License.
 
 group("ActsDacTest") {
-  deps = [
-    "./jffs:ActsJFFS2DACTest",
-    "./vfat:ActsVFATDACTest",
-  ]
+  deps = [ "./vfat:ActsVFATDACTest" ]
 }

security_lite/permission_posix/dac/jffs/BUILD.gn

-# Copyright (c) 2021 Huawei Device Co., Ltd.
-# 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.
-
-import("//test/xts/tools/lite/build/suite_lite.gni")
-
-hcpptest_suite("ActsJFFS2DACTest") {
-  suite_name = "acts"
-  sources = [
-    "../src/ActsDacPreTest.cpp",
-    "../src/ActsDacTest.cpp",
-    "../src/ActsSystemDevDacTest.cpp",
-    "../src/ActsSystemJffsDacTest.cpp",
-    "../src/DACFileSystemTest.cpp",
-  ]
-
-  include_dirs = [
-    "../src",
-    "../../capability/src",
-    "//third_party/bounds_checking_function/include",
-  ]
-
-  public_deps = [
-    "../../capability:capability_shared",
-    "//third_party/bounds_checking_function:libsec_shared",
-  ]
-
-  cflags_cc = [
-    "-Wno-write-strings",
-    "-Wno-sign-compare",
-  ]
-
-  ldflags = [
-    "-lstdc++",
-    "-lm",
-    "-lpthread",
-  ]
-
-  defines = [
-    "LITE_FS_JFFS2",
-    "TOP_DIR=\"/storage\"",
-    "TOP_DIR_MOUNT_INFO=\"/storage jffs\"",
-  ]
-}

security_lite/permission_posix/dac/jffs/Test.json

-{
-    "description": "Config for hcpptest demo test cases",
-    "environment": [
-        {
-            "type": "device",
-            "label": "ipcamera"
-        }
-    ],
-    "kits": [
-        {
-            "type": "MountKit",
-            "server": "NfsServer",
-            "mount": [
-                {
-                    "source": "testcases/security",
-                    "target": "/test_root/security"
-                }
-            ]
-        }
-    ],
-    "driver": {
-        "type": "CppTestLite",
-        "execute": "/test_root/security/ActsJFFS2DACTest.bin"
-    }
-}
\ No newline at end of file

security_lite/permission_posix/dac/src/ActsDacPreTest.cpp

@@ -25,7 +25,7 @@
 using namespace std;
 using namespace testing::ext;
 
-#if defined(LITE_FS_JFFS2) || defined(LITE_FS_VFAT)
+#if defined(LITE_FS_VFAT)
 static int TestSetUid()
 {
     // Test the 'setuid' interface

security_lite/permission_posix/dac/vfat/BUILD.gn

@@ -17,9 +17,6 @@ hcpptest_suite("ActsVFATDACTest") {
   suite_name = "acts"
   sources = [
     "../src/ActsDacPreTest.cpp",
-    "../src/ActsDacTest.cpp",
-    "../src/ActsSystemDevDacTest.cpp",
-    "../src/ActsSystemJffsDacTest.cpp",
     "../src/DACFileSystemTest.cpp",
   ]