From: biao716.wang <biao716.wang@samsung.com>
Date: Mon, 31 May 2021 11:44:24 +0000 (+0900)
Subject: Fix case error because of using the latest milestone tizen base release
X-Git-Tag: submit/trunk/20210602.131730^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c80c9bc1a9b74460b1b6a27b1eb6031f27a7d484;p=tools%2Fitest-cases-gbs.git

Fix case error because of using the latest milestone tizen base release

Change-Id: Ie5a733f7a1f94118eb3c98eb4e796bb680258203
Signed-off-by: biao716.wang <biao716.wang@samsung.com>
---

diff --git a/cases/build/test_build_multi_specs_patch.case b/cases/build/test_build_multi_specs_patch.case
index 8c1c9a0..3f5df9a 100644
--- a/cases/build/test_build_multi_specs_patch.case
+++ b/cases/build/test_build_multi_specs_patch.case
@@ -32,10 +32,10 @@ cd ..
 
 gbs -c base.cfg build --clean -A i586 fake 2>&1|tee log
 
-TIMES=$(grep '/SOURCES/0001-hello.patch' log|wc -l)
+TIMES=$(grep 'Patch #0 (0001-hello.patch)' log|wc -l)
 
 #apply patch both in build fake and fake-lib
-[ "$TIMES" -eq "2" ]
+[ "$TIMES" -eq "4" ]
 
 AssertCleanWith fake
 
diff --git a/cases/build/test_build_multispecs_patch_include.case b/cases/build/test_build_multispecs_patch_include.case
index 98d6bab..d41e0c8 100644
--- a/cases/build/test_build_multispecs_patch_include.case
+++ b/cases/build/test_build_multispecs_patch_include.case
@@ -35,10 +35,10 @@ cd ..
 gbs -c base.cfg build -A i586 fake --include-all 2>&1|tee log
 
 #TIMES=$(grep '/home/abuild/rpmbuild/SOURCES/0001-hello.patch' log|wc -l)
-TIMES=$(grep '/SOURCES/0001-hello.patch' log|wc -l)
+TIMES=$(grep 'Patch #0 (0001-hello.patch)' log|wc -l)
 
 #apply patch both in build fake and fake-lib
-[ "$TIMES" -eq "2" ]
+[ "$TIMES" -eq "4" ]
 
 AssertCleanWith fake
 
diff --git a/fixtures/conf/tizen.conf b/fixtures/conf/tizen.conf
index 8cfe5d8..c6a314d 100644
--- a/fixtures/conf/tizen.conf
+++ b/fixtures/conf/tizen.conf
@@ -55,7 +55,7 @@ Macros:
 %release_name Tizen6/Unified
 
 %tizen_version_major 6
-%tizen_version_minor 0
+%tizen_version_minor 5
 %tizen_version_patch 0
 
 %tizen_version %{tizen_version_major}.%{tizen_version_minor}
@@ -158,6 +158,7 @@ Preinstall: smack libsmack libxml2 libmagic  libmagic-data
 Preinstall: libsqlite
 #Preinstall: rpm-security-plugin
 Preinstall: util-linux util-linux-su
+Preinstall: libzstd1
 
 VMinstall: perl libmount libblkid libext2fs libuuid  grep libpcre util-linux libsmartcols procps-ng
 
@@ -216,7 +217,7 @@ Substitute: glibc-devel-32bit
 
 Optflags: armv7l %{__global_cflags} --param=ssp-buffer-size=4 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -mthumb -Wp,-D__SOFTFP__ -Wl,-O1 -Wl,--hash-style=gnu -Wa,-mimplicit-it=thumb
 Optflags: aarch64 %{__global_cflags} -feliminate-unused-debug-types -Wformat -march=armv8-a+fp+simd+crc+crypto -mtune=cortex-a57.cortex-a53
-Optflags: i686 %{__global_cflags} -feliminate-unused-debug-types --param=ssp-buffer-size=4 -fdiagnostics-color=never -m32 -march=i686 -mtune=i686 -msse4.2 -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer -mstackrealign
+Optflags: i686 %{__global_cflags} -feliminate-unused-debug-types --param=ssp-buffer-size=4 -fdiagnostics-color=never -m32 -march=i686 -mtune=i686 -msse4.2 -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer -mstackrealign -Wl,-z,noseparate-code
 Optflags: x86_64 %{__global_cflags} -feliminate-unused-debug-types --param=ssp-buffer-size=4 -fdiagnostics-color=never -m64 -march=nehalem -msse4.2 -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer
 ### from Tizen:Unified
 %define _repository standard
@@ -254,9 +255,9 @@ Macros:
 # %release_name and %tizen_full_version are used in platform/upstream/tizen-release
 
 Macros:
-%release_name Tizen5/Unified
+%release_name Tizen6/Unified
 
-%tizen_version_major 5
+%tizen_version_major 6
 %tizen_version_minor 5
 %tizen_version_patch 0
 
@@ -383,5 +384,4 @@ Macros:
 
 ############################# other config #####################################
 # derived from Tizen:Base
-################################################################################
-
+################################################################################
\ No newline at end of file