From 13b926d14b3c55ced2093997377c0238ff405057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B2=82=E8=85=BE?=
 <zhangyiteng@cqsofteware.com.cn>
Date: Thu, 27 Feb 2025 17:52:01 +0800
Subject: [PATCH 1/3] fix oe_test_ccmake and oe_test_ccmake3

---
 .../cmake/oe_test_ccmake/oe_test_ccmake.sh    | 24 +++++++++----------
 .../cmake/oe_test_ccmake3/oe_test_ccmake3.sh  | 24 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/testcases/cli-test/cmake/oe_test_ccmake/oe_test_ccmake.sh b/testcases/cli-test/cmake/oe_test_ccmake/oe_test_ccmake.sh
index 983b44286..9f77291a2 100644
--- a/testcases/cli-test/cmake/oe_test_ccmake/oe_test_ccmake.sh
+++ b/testcases/cli-test/cmake/oe_test_ccmake/oe_test_ccmake.sh
@@ -40,7 +40,7 @@ function run_test() {
     CHECK_RESULT $?
     if [ "$VERSION_ID" != "22.03" ]; then
         expect <<EOF
-        spawn ccmake -B ../buildccmake -S ../common/
+        spawn ccmake -B ../buildccmake -S ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect "*" {send "\r"}
         expect "*" {send "Debug\r"}
@@ -50,7 +50,7 @@ function run_test() {
 EOF
     else
         expect <<EOF
-        spawn ccmake -B ../buildccmake -S ../common/
+        spawn ccmake -B ../buildccmake -S ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect " " {send "e"}
         expect "*" {send "\r"}
@@ -68,7 +68,7 @@ EOF
     CHECK_RESULT $?
     if [ "$VERSION_ID" != "22.03" ]; then
         expect <<EOF
-        spawn ccmake -C ../common/mysettings.cmake ../common/
+        spawn ccmake -C ../common/mysettings.cmake ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect "*" {send "\r"}
         expect "*" {send "Debug\r"}
@@ -78,7 +78,7 @@ EOF
 EOF
     else
         expect <<EOF
-        spawn ccmake -C ../common/mysettings.cmake ../common/
+        spawn ccmake -C ../common/mysettings.cmake ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect " " {send "e"}
         expect "*" {send "\r"}
@@ -97,7 +97,7 @@ EOF
     rm -rf ./CMake* ./build* ./cmake* ./Make*
     if [ "$VERSION_ID" != "22.03" ]; then
         expect <<EOF
-        spawn ccmake -DCMAKE_BUILD_TYPE:STRING=RELEASE ../common/
+        spawn ccmake -DCMAKE_BUILD_TYPE:STRING=RELEASE ../../common/
         expect "CMAKE_BUILD_TYPE:" {send "c"}
         expect "CMAKE_INSTALL_PREFIX:" {send "c"}
         expect "CMAKE_BUILD_TYPE:" {send "g"}
@@ -105,7 +105,7 @@ EOF
 EOF
     else
         expect <<EOF
-        spawn ccmake -DCMAKE_BUILD_TYPE:STRING=RELEASE ../common/
+        spawn ccmake -DCMAKE_BUILD_TYPE:STRING=RELEASE ../../common/
         expect "CMAKE_BUILD_TYPE:" {send "c"}
         expect " " {send "e"}
         expect "CMAKE_INSTALL_PREFIX:" {send "c"}
@@ -121,7 +121,7 @@ EOF
     rm -rf ./CMake* ./build* ./cmake* ./Make*
     if [ "$VERSION_ID" != "22.03" ]; then
         expect <<EOF
-        spawn ccmake -UCMAKE_BUILD_TYPE ../common/
+        spawn ccmake -UCMAKE_BUILD_TYPE ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect "*" {send "c"}
         expect "CMAKE_BUILD_TYPE:" {send "g"}
@@ -129,7 +129,7 @@ EOF
 EOF
     else
         expect <<EOF
-        spawn ccmake -UCMAKE_BUILD_TYPE ../common/
+        spawn ccmake -UCMAKE_BUILD_TYPE ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect " " {send "e"}
         expect "*" {send "c"}
@@ -145,7 +145,7 @@ EOF
     rm -rf ./CMake* ./build* ./cmake* ./Make*
     if [ "$VERSION_ID" != "22.03" ]; then
         expect <<EOF
-        spawn ccmake -G "Unix Makefiles" ../common/
+        spawn ccmake -G "Unix Makefiles" ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect "*" {send "c"}
         expect "CMAKE_BUILD_TYPE:" {send "g"}
@@ -153,7 +153,7 @@ EOF
 EOF
     else
         expect <<EOF
-        spawn ccmake -G "Unix Makefiles" ../common/
+        spawn ccmake -G "Unix Makefiles" ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect " " {send "e"}
         expect "*" {send "c"}
@@ -169,7 +169,7 @@ EOF
     rm -rf ./CMake* ./build* ./cmake* ./Make*
     if [ "$VERSION_ID" != "22.03" ]; then
         expect <<EOF
-        spawn ccmake -G "Ninja" ../common/
+        spawn ccmake -G "Ninja" ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect "*" {send "c"}
         expect "CMAKE_BUILD_TYPE:" {send "g"}
@@ -177,7 +177,7 @@ EOF
 EOF
     else
         expect <<EOF
-        spawn ccmake -G "Ninja" ../common/
+        spawn ccmake -G "Ninja" ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect " " {send "e"}
         expect "*" {send "c"}
diff --git a/testcases/cli-test/cmake/oe_test_ccmake3/oe_test_ccmake3.sh b/testcases/cli-test/cmake/oe_test_ccmake3/oe_test_ccmake3.sh
index e9c09387b..b28ace80a 100644
--- a/testcases/cli-test/cmake/oe_test_ccmake3/oe_test_ccmake3.sh
+++ b/testcases/cli-test/cmake/oe_test_ccmake3/oe_test_ccmake3.sh
@@ -40,7 +40,7 @@ function run_test() {
     CHECK_RESULT $?
     if [ "$VERSION_ID" != "22.03" ]; then
         expect <<EOF
-        spawn ccmake3 -B ../buildccmake3 -S ../common/
+        spawn ccmake3 -B ../buildccmake3 -S ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect "*" {send "\r"}
         expect "*" {send "Debug\r"}
@@ -50,7 +50,7 @@ function run_test() {
 EOF
     else
         expect <<EOF
-        spawn ccmake3 -B ../buildccmake3 -S ../common/
+        spawn ccmake3 -B ../buildccmake3 -S ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect " " {send "e"}
         expect "*" {send "\r"}
@@ -67,7 +67,7 @@ EOF
     CHECK_RESULT $?
     if [ "$VERSION_ID" != "22.03" ]; then
         expect <<EOF
-        spawn ccmake3 -C ../common/mysettings.cmake ../common/
+        spawn ccmake3 -C ../common/mysettings.cmake ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect "*" {send "\r"}
         expect "*" {send "Debug\r"}
@@ -77,7 +77,7 @@ EOF
 EOF
     else
         expect <<EOF
-        spawn ccmake3 -C ../common/mysettings.cmake ../common/
+        spawn ccmake3 -C ../common/mysettings.cmake ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect " " {send "e"}
         expect "*" {send "\r"}
@@ -95,7 +95,7 @@ EOF
     rm -rf ./*
     if [ "$VERSION_ID" != "22.03" ]; then
         expect <<EOF
-        spawn ccmake3 -DCMAKE_BUILD_TYPE:STRING=RELEASE ../common/
+        spawn ccmake3 -DCMAKE_BUILD_TYPE:STRING=RELEASE ../../common/
         expect "CMAKE_BUILD_TYPE:" {send "c"}
         expect "CMAKE_INSTALL_PREFIX:" {send "c"}
         expect "CMAKE_BUILD_TYPE:" {send "g"}
@@ -103,7 +103,7 @@ EOF
 EOF
     else
         expect <<EOF
-        spawn ccmake3 -DCMAKE_BUILD_TYPE:STRING=RELEASE ../common/
+        spawn ccmake3 -DCMAKE_BUILD_TYPE:STRING=RELEASE ../../common/
         expect "CMAKE_BUILD_TYPE:" {send "c"}
         expect " " {send "e"}
         expect "CMAKE_INSTALL_PREFIX:" {send "c"}
@@ -119,7 +119,7 @@ EOF
     rm -rf ./*
     if [ "$VERSION_ID" != "22.03" ]; then
         expect <<EOF
-        spawn ccmake3 -UCMAKE_BUILD_TYPE ../common/
+        spawn ccmake3 -UCMAKE_BUILD_TYPE ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect "*" {send "c"}
         expect "CMAKE_BUILD_TYPE:" {send "g"}
@@ -127,7 +127,7 @@ EOF
 EOF
     else
         expect <<EOF
-        spawn ccmake3 -UCMAKE_BUILD_TYPE ../common/
+        spawn ccmake3 -UCMAKE_BUILD_TYPE ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect " " {send "e"}
         expect "*" {send "c"}
@@ -143,7 +143,7 @@ EOF
     rm -rf ./*
     if [ "$VERSION_ID" != "22.03" ]; then
         expect <<EOF
-        spawn ccmake3 -G "Unix Makefiles" ../common/
+        spawn ccmake3 -G "Unix Makefiles" ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect "*" {send "c"}
         expect "CMAKE_BUILD_TYPE:" {send "g"}
@@ -151,7 +151,7 @@ EOF
 EOF
     else
         expect <<EOF
-        spawn ccmake3 -G "Unix Makefiles" ../common/
+        spawn ccmake3 -G "Unix Makefiles" ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect " " {send "e"}
         expect "*" {send "c"}
@@ -167,7 +167,7 @@ EOF
     rm -rf ./*
     if [ "$VERSION_ID" != "22.03" ]; then
         expect <<EOF
-        spawn ccmake3 -G "Ninja" ../common/
+        spawn ccmake3 -G "Ninja" ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect "*" {send "c"}
         expect "CMAKE_BUILD_TYPE:" {send "g"}
@@ -175,7 +175,7 @@ EOF
 EOF
     else
         expect <<EOF
-        spawn ccmake3 -G "Ninja" ../common/
+        spawn ccmake3 -G "Ninja" ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect " " {send "e"}
         expect "*" {send "c"}
-- 
Gitee


From 1acbfc16e73c9da3dc566b429668d90d7ae6d8a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=81=BC=E6=A6=86?= <zhangyiteng@cqsoftware.com.cn>
Date: Wed, 5 Mar 2025 06:06:57 +0000
Subject: [PATCH 2/3] update
 testcases/cli-test/cmake/oe_test_ccmake/oe_test_ccmake.sh.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 灼榆 <zhangyiteng@cqsoftware.com.cn>
---
 testcases/cli-test/cmake/oe_test_ccmake/oe_test_ccmake.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testcases/cli-test/cmake/oe_test_ccmake/oe_test_ccmake.sh b/testcases/cli-test/cmake/oe_test_ccmake/oe_test_ccmake.sh
index 9f77291a2..c13929968 100644
--- a/testcases/cli-test/cmake/oe_test_ccmake/oe_test_ccmake.sh
+++ b/testcases/cli-test/cmake/oe_test_ccmake/oe_test_ccmake.sh
@@ -68,7 +68,7 @@ EOF
     CHECK_RESULT $?
     if [ "$VERSION_ID" != "22.03" ]; then
         expect <<EOF
-        spawn ccmake -C ../common/mysettings.cmake ../../common/
+        spawn ccmake -C ../../common/mysettings.cmake ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect "*" {send "\r"}
         expect "*" {send "Debug\r"}
@@ -78,7 +78,7 @@ EOF
 EOF
     else
         expect <<EOF
-        spawn ccmake -C ../common/mysettings.cmake ../../common/
+        spawn ccmake -C ../../common/mysettings.cmake ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect " " {send "e"}
         expect "*" {send "\r"}
-- 
Gitee


From 2fa69aa52ff407dcfa5246ead20bbf92191bff26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=81=BC=E6=A6=86?= <zhangyiteng@cqsoftware.com.cn>
Date: Wed, 5 Mar 2025 06:07:50 +0000
Subject: [PATCH 3/3] update
 testcases/cli-test/cmake/oe_test_ccmake3/oe_test_ccmake3.sh.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 灼榆 <zhangyiteng@cqsoftware.com.cn>
---
 testcases/cli-test/cmake/oe_test_ccmake3/oe_test_ccmake3.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testcases/cli-test/cmake/oe_test_ccmake3/oe_test_ccmake3.sh b/testcases/cli-test/cmake/oe_test_ccmake3/oe_test_ccmake3.sh
index b28ace80a..3be628fd9 100644
--- a/testcases/cli-test/cmake/oe_test_ccmake3/oe_test_ccmake3.sh
+++ b/testcases/cli-test/cmake/oe_test_ccmake3/oe_test_ccmake3.sh
@@ -67,7 +67,7 @@ EOF
     CHECK_RESULT $?
     if [ "$VERSION_ID" != "22.03" ]; then
         expect <<EOF
-        spawn ccmake3 -C ../common/mysettings.cmake ../../common/
+        spawn ccmake3 -C ../../common/mysettings.cmake ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect "*" {send "\r"}
         expect "*" {send "Debug\r"}
@@ -77,7 +77,7 @@ EOF
 EOF
     else
         expect <<EOF
-        spawn ccmake3 -C ../common/mysettings.cmake ../../common/
+        spawn ccmake3 -C ../../common/mysettings.cmake ../../common/
         expect "EMPTY CACHE" {send "c"}
         expect " " {send "e"}
         expect "*" {send "\r"}
-- 
Gitee