diff --git a/kernel.mk b/kernel.mk index a4bfb820cf806499820f20db6b26973c707f5851..585e1e93c73a471a44c71f424ac3373215b6af7f 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 f327f9a7609efdd2f4f135e58ac7ffc590b6dbf3..29c953b684e18b2c06f6856a2642caeb7fc68b70 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 267a0c88239a71ab52f0190047fb8ef77051918d..429b78b32baac56a41bf0622ab58bf65f5ea1afd 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 50668323779b172c5b49397577c0a608b80d1375..e69d87130c377ada2227e0f5ac33e8641d83ca83 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 ae75dec5f3e28532b4ad80be56dc3b0573c7f527..abdfd4731b547816ea7f027005595b6268d4ab13 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 */