From b21df2bf8fb5042b0681d7b51217076b65d3e27e Mon Sep 17 00:00:00 2001 From: Neil Chen Date: Sat, 18 Jun 2022 19:41:16 +0800 Subject: [PATCH] fix typo and path name for vendor/hisilicon/watchos patches Signed-off-by: Neil Chen --- kernel.mk | 2 +- .../bin/cpuisolation_t/testcases/bin/cpuisolation03.sh | 4 ++-- .../runtest/bin/sched_rtg_t/testcases/bin/sched_rtg01.sh | 4 ++-- .../runtest/bin/sched_rtg_t/testcases/bin/sched_rtg06.sh | 4 ++-- test/unittest/accesstokenid/accesstokenid_test.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kernel.mk b/kernel.mk index a4bfb82..585e1e9 100755 --- a/kernel.mk +++ b/kernel.mk @@ -63,7 +63,7 @@ endif ifneq ($(findstring $(BUILD_TYPE), small standard),) DEVICE_PATCH_DIR := $(OHOS_BUILD_HOME)/kernel/linux/patches/${KERNEL_VERSION}/$(DEVICE_NAME)_patch DEVICE_PATCH_FILE := $(DEVICE_PATCH_DIR)/$(DEVICE_NAME).patch -PRODUCT_PATCH_FILE := $(OHOS_BUILD_HOME)/vendor/hisilicon/watchos/patchs/$(DEVICE_NAME).patch +PRODUCT_PATCH_FILE := $(OHOS_BUILD_HOME)/vendor/hisilicon/watchos/patches/$(DEVICE_NAME).patch HDF_PATCH_FILE := $(DEVICE_PATCH_DIR)/hdf.patch SMALL_PATCH_FILE := $(DEVICE_PATCH_DIR)/$(DEVICE_NAME)_$(BUILD_TYPE).patch KERNEL_IMAGE_FILE := $(KERNEL_SRC_TMP_PATH)/arch/$(KERNEL_ARCH)/boot/$(KERNEL_IMAGE) diff --git a/test/moduletest/runtest/bin/cpuisolation_t/testcases/bin/cpuisolation03.sh b/test/moduletest/runtest/bin/cpuisolation_t/testcases/bin/cpuisolation03.sh index f327f9a..29c953b 100644 --- a/test/moduletest/runtest/bin/cpuisolation_t/testcases/bin/cpuisolation03.sh +++ b/test/moduletest/runtest/bin/cpuisolation_t/testcases/bin/cpuisolation03.sh @@ -224,7 +224,7 @@ active_cpu_online() isolated_num3=$(( $isolated_num3 + 1 )) done if [ $isolated_num3 -eq 2 ]; then - tst_res TPASS "isolated number doesnt change." + tst_res TPASS "isolated number does not change." else tst_res TFAIL "isolated number had been changed." fi @@ -243,4 +243,4 @@ do_clean() do_setup do_test do_clean -tst_exit \ No newline at end of file +tst_exit diff --git a/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg01.sh b/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg01.sh index 267a0c8..429b78b 100644 --- a/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg01.sh +++ b/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg01.sh @@ -65,7 +65,7 @@ do_test() fi local rtgid3=$(cat $sched_group_id) if [ $rtgid3 -eq 3 ]; then - tst_res TFAIL "process $PID switch rtgid 2 to 3 sucess unexpected!" + tst_res TFAIL "process $PID switch rtgid 2 to 3 success unexpected!" res=$(($res + 1)) fi @@ -96,4 +96,4 @@ do_clean() do_setup do_test do_clean -tst_exit \ No newline at end of file +tst_exit diff --git a/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg06.sh b/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg06.sh index 5066832..e69d871 100644 --- a/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg06.sh +++ b/test/moduletest/runtest/bin/sched_rtg_t/testcases/bin/sched_rtg06.sh @@ -65,7 +65,7 @@ stability_test() tst_res TINFO "kill 40 task processes...." ps -ef | grep "create_process" | grep -v "grep" | grep -v ${PPID} | cut -c 9-18 | xargs kill -9 sleep 5 - tst_res TINFO "kill process successed." + tst_res TINFO "kill process succeeded." aa start -b ohos.samples.ecg -a ohos.samples.ecg.default && sleep 1 && PID=$(ps -ef | grep ohos.samples.ecg | grep -v grep | awk '{print $2}') @@ -147,4 +147,4 @@ do_clean() do_setup do_test do_clean -tst_exit \ No newline at end of file +tst_exit diff --git a/test/unittest/accesstokenid/accesstokenid_test.cpp b/test/unittest/accesstokenid/accesstokenid_test.cpp index ae75dec..abdfd47 100644 --- a/test/unittest/accesstokenid/accesstokenid_test.cpp +++ b/test/unittest/accesstokenid/accesstokenid_test.cpp @@ -321,7 +321,7 @@ HWTEST_F(AccesstokenidTest, CheckChildThreadInheritance, Function | MediumTest | /** * @tc.name: CheckChildThreadSetIndepent - * @tc.desc: Test each child thread tokenid and ftokenid is indepent + * @tc.desc: Test each child thread tokenid and ftokenid is independent * @tc.desc: The tokenid and ftokenid of each child thread not equal to father process * @tc.type: FUNC */ -- Gitee