Fix git status info in Ubuntu16.10

Change-Id: I4557176eefa9a4e4b3383ef959230f766d050e7b

diff --git a/cases/build/test_build_arch_compatible_with_spec.case b/cases/build/test_build_arch_compatible_with_spec.case
index 9225a8cfc0ec0df159ebae934f3a9765829d9fcb..b9d8b61ce20bba5d24dca27ecda892b51b710c72 100644 (file)
--- a/cases/build/test_build_arch_compatible_with_spec.case
+++ b/cases/build/test_build_arch_compatible_with_spec.case
@@ -22,6 +22,6 @@ test -n "`grep "build arch not compatible" log`"
 test -n "`grep ".*no available packages to build" log`"
 
 #check source package not changed
-cd fake && test -n "`git status | grep "working directory clean"`"
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`"
 ]]></steps>
 </testcase>

diff --git a/cases/build/test_build_commit_ia32_negative.case b/cases/build/test_build_commit_ia32_negative.case
index 2a317e6b0265bdb137dc2af0689c935f5572aea3..24f28c67b137df31f733b254dc0996b025053445 100644 (file)
--- a/cases/build/test_build_commit_ia32_negative.case
+++ b/cases/build/test_build_commit_ia32_negative.case
@@ -21,7 +21,7 @@ cd ..
 
 (! grep "mount:.*scratch" log)
 
-cd fake && test -n "`git status | grep "working directory clean"`" && cd ..
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
 grep "error:.*multiple packages" log
 ]]></steps>

diff --git a/cases/build/test_build_configure_exlude_packages_in_profile_section.case b/cases/build/test_build_configure_exlude_packages_in_profile_section.case
index b2706ee0c3e19e418151ce3600e59b30cece345d..8b45bcdceb22ea5fa194863e3ab20276b6bcfa5b 100644 (file)
--- a/cases/build/test_build_configure_exlude_packages_in_profile_section.case
+++ b/cases/build/test_build_configure_exlude_packages_in_profile_section.case
@@ -23,11 +23,11 @@ sed -i "/\[profile.tizen\]/a exclude_packages=fake, fake-dev" base.cfg
 
 gbs -c base.cfg build -A i586 | tee log
 
-cd fake && test -n "`git status | grep "working directory clean"`" && cd ..
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
-cd power && test -n "`git status | grep "working directory clean"`" && cd ..
+cd power && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
-cd xorg-x11-filesystem && test -n "`git status | grep "working directory clean"`" && cd ..
+cd xorg-x11-filesystem && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
 test -z "`find ~/GBS-ROOT/local/repos -name "*fake*.rpm"`"
 

diff --git a/cases/build/test_build_dist_negative_ia32.case b/cases/build/test_build_dist_negative_ia32.case
index 0cca8c6d77c2c43f63f4d19cca5bd678a7750a28..beb2d89096d76c6b632d4f2c4311aa9b877d9c16 100644 (file)
--- a/cases/build/test_build_dist_negative_ia32.case
+++ b/cases/build/test_build_dist_negative_ia32.case
@@ -20,6 +20,6 @@ sudo /bin/rm -rf ~/GBS-ROOT/local/BUILD-ROOTS/*scratch*0*
 
 test -z "`grep "mount:.*scratch" log`"
 
-cd xorg-x11-filesystem && test -n "`git status | grep "working directory clean"`" && cd ..
+cd xorg-x11-filesystem && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 ]]></steps>
 </testcase>

diff --git a/cases/build/test_build_fallback-to-native_with_no_tag.case b/cases/build/test_build_fallback-to-native_with_no_tag.case
index 9e32b15b10b24f092ecdbc3d06564f7f3e791f9b..084ee0999cc8b10abbcf269ad2fb98cbe03a240a 100644 (file)
--- a/cases/build/test_build_fallback-to-native_with_no_tag.case
+++ b/cases/build/test_build_fallback-to-native_with_no_tag.case
@@ -25,7 +25,7 @@ git tag | grep upstream/0.1
 gbs -c ../base.cfg build -A i586 2>&1 | tee ../log1
 
 # Check that build has been finished sucessful.
-test -n "`git status | grep "working directory clean"`"
+test -n "`git status | grep -E "working tree|directory clean"`"
 
 test -n "`find ~/GBS-ROOT/local/repos -name "*sw-tools*.rpm"`"
 
@@ -51,7 +51,7 @@ gbs -c ../base.cfg build -A i586 --fallback-to-native --clean --clean-repos 2>&1
 # Check that build has been finished sucessful.
 grep -i "Falling back to native, i.e. creating source archive directly from exported commit, without any patches" ../log3
 
-test -n "`git status | grep "working directory clean"`"
+test -n "`git status | grep -E "working tree|directory clean"`"
 
 test -n "`find ~/GBS-ROOT/local/repos -name "*sw-tools*.rpm"`"
 

diff --git a/cases/build/test_build_fallback-to-native_with_non-default_gbs_configuration.case b/cases/build/test_build_fallback-to-native_with_non-default_gbs_configuration.case
index bb7c78c8c68bf8ac9ff571dc4f9e8931644e1955..4dde22ad6c8a0a37aed7dd1c4afc8229af1c19d4 100644 (file)
--- a/cases/build/test_build_fallback-to-native_with_non-default_gbs_configuration.case
+++ b/cases/build/test_build_fallback-to-native_with_non-default_gbs_configuration.case
@@ -25,7 +25,7 @@ git tag | grep upstream/0.1
 gbs -c ../base.cfg build -A i586 2>&1 | tee ../log1
 
 # Check that build has been finished sucessful.
-test -n "`git status | grep "working directory clean"`"
+test -n "`git status | grep -E "working tree|directory clean"`"
 
 test -n "`find ~/GBS-ROOT/local/repos -name "*sw-tools*.rpm"`"
 
@@ -54,7 +54,7 @@ gbs -c ../base.cfg build -A i586 --clean --clean-repos 2>&1 | tee ../log3
 # Check that build has been finished sucessful.
 grep -i "Falling back to native, i.e. creating source archive directly from exported commit, without any patches" ../log3
 
-test -n "`git status | grep "working directory clean"`"
+test -n "`git status | grep -E "working tree|directory clean"`"
 
 test -n "`find ~/GBS-ROOT/local/repos -name "*sw-tools*.rpm"`"
 

diff --git a/cases/build/test_build_keep-packs_arm.case b/cases/build/test_build_keep-packs_arm.case
index 70a73857860bec5e403acbca4014f6c2b3dbb37e..2fac9bd2057b9aee3a26b4431c96b0aee36d86d9 100644 (file)
--- a/cases/build/test_build_keep-packs_arm.case
+++ b/cases/build/test_build_keep-packs_arm.case
@@ -29,7 +29,7 @@ test -z "`grep "deleting.*" log`"
 
 test -n "`grep "init_buildsystem.*keep-packs" log`"
 
-cd xorg-x11-filesystem && test -n "`git status | grep "working directory clean"`" && cd ..
+cd xorg-x11-filesystem && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
 test -n "`find ~/GBS-ROOT/local/repos -name "*xorg-x11-filesystem*.rpm"`"
 

diff --git a/cases/build/test_build_keep-packs_ia32.case b/cases/build/test_build_keep-packs_ia32.case
index d8c74da5eadea185d1dd82478710e40f21d66f68..54bf0b07856806844659e739b6aa47dedc62c24d 100644 (file)
--- a/cases/build/test_build_keep-packs_ia32.case
+++ b/cases/build/test_build_keep-packs_ia32.case
@@ -29,7 +29,7 @@ test -z "`grep "deleting.*" log`"
 
 test -n "`grep "init_buildsystem.*keep-packs" log`"
 
-cd xorg-x11-filesystem && test -n "`git status | grep "working directory clean"`" && cd ..
+cd xorg-x11-filesystem && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
 test -n "`find ~/GBS-ROOT/local/repos -name "*xorg-x11-filesystem*.rpm"`"
 

diff --git a/cases/build/test_build_multi-pkgs_with_noinit.case b/cases/build/test_build_multi-pkgs_with_noinit.case
index ac398e2d8a4076e40de5e42370ca2b0b84cb8c9f..0b247ad3b4a26f4f931b3a321adc8222bdcca679 100644 (file)
--- a/cases/build/test_build_multi-pkgs_with_noinit.case
+++ b/cases/build/test_build_multi-pkgs_with_noinit.case
@@ -23,11 +23,11 @@ gbs -c base.cfg build --clean fake -A i586
 
 (! gbs -c base.cfg build --noinit -A i586 2>&1 | tee log)
 
-cd fake && test -n "`git status | grep "working directory clean"`" && cd ..
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
-cd power && test -n "`git status | grep "working directory clean"`" && cd ..
+cd power && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
-cd xorg-x11-filesystem && test -n "`git status | grep "working directory clean"`" && cd ..
+cd xorg-x11-filesystem && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
 grep "\--noinit build only support building one package" log
 

diff --git a/cases/build/test_build_noinit_clean-once_ia32.case b/cases/build/test_build_noinit_clean-once_ia32.case
index 50f23e8e86254ddb8b8440b4bb5bd15d8c8ce779..db47166b53c53a8b5c7a1c82dda5cebafdf980b7 100644 (file)
--- a/cases/build/test_build_noinit_clean-once_ia32.case
+++ b/cases/build/test_build_noinit_clean-once_ia32.case
@@ -14,7 +14,7 @@ sudo /bin/rm -rf ~/GBS-ROOT/local/repos
 
 test -z "`grep "generate repositories" log`"
 
-cd sw-tools && test -n "`git status | grep "working directory clean"`" && cd ..
+cd sw-tools && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
 test -n "`grep "error.*noinit.*clean-once" log`"
 ]]></steps>

diff --git a/cases/build/test_build_noinit_clean_ia32.case b/cases/build/test_build_noinit_clean_ia32.case
index 055f3fa6f50ea8c2dd41bd3d255582e085c32550..315cb1cdc634eb81cf6eab5399e8191a4fa2e8e4 100644 (file)
--- a/cases/build/test_build_noinit_clean_ia32.case
+++ b/cases/build/test_build_noinit_clean_ia32.case
@@ -14,7 +14,7 @@ sudo /bin/rm -rf ~/GBS-ROOT/local/repos
 
 test -z "`grep "generate repositories" log`"
 
-cd sw-tools && test -n "`git status | grep "working directory clean"`" && cd ..
+cd sw-tools && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
 test -n "`grep "error.*noinit.*clean" log`"
 ]]></steps>

diff --git a/cases/build/test_build_noinit_without_buildroot.case b/cases/build/test_build_noinit_without_buildroot.case
index 17afaee06d330ebfe9b8292f50476ca8859ca030..2ad75fe377fa78ebfbee77c3627cffeb22e835b5 100644 (file)
--- a/cases/build/test_build_noinit_without_buildroot.case
+++ b/cases/build/test_build_noinit_without_buildroot.case
@@ -14,6 +14,6 @@ sudo /bin/rm -rf ~/GBS-ROOT/local/BUILD-ROOTS/scratch.i*
 
 grep "build root:.* does not exist\. Please build without --noinit first" log
 
-cd fake && test -n "`git status | grep "working directory clean"`" && cd ..
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 ]]></steps>
 </testcase>

diff --git a/cases/build/test_build_noinit_without_buildroot_ia32.case b/cases/build/test_build_noinit_without_buildroot_ia32.case
index 122197a9432f17907bea02d4ac0c30c86e75305a..b3b25d744b8b2e76adb2fceeb1fcc62f24366a75 100644 (file)
--- a/cases/build/test_build_noinit_without_buildroot_ia32.case
+++ b/cases/build/test_build_noinit_without_buildroot_ia32.case
@@ -16,7 +16,7 @@ sudo /bin/rm -rf ~/GBS-ROOT/local/BUILD-ROOTS/scratch*i586*
 
 test -z "`grep "generate repositories" log`"
 
-cd sw-tools && test -n "`git status | grep "working directory clean"`" && cd ..
+cd sw-tools && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
 test -n "`grep "error.*scratch.*does not exist" log`"
 ]]></steps>

diff --git a/cases/build/test_build_on_develop_branch.case b/cases/build/test_build_on_develop_branch.case
index 1cf2862c342422f06e080056620f29b27f1e7cbc..b1183c23f2139d5724794033f3d837e4f0897044 100644 (file)
--- a/cases/build/test_build_on_develop_branch.case
+++ b/cases/build/test_build_on_develop_branch.case
@@ -26,7 +26,7 @@ test -n "`git branch | grep "development"`"
 gbs -c ../base.cfg build -A i586 2>&1
 
 # Check successfully build result.
-test -n "`git status | grep "working directory clean"`"
+test -n "`git status | grep -E "working tree|directory clean"`"
 
 test -n "`find ~/GBS-ROOT/local/repos -name "*sw-tools*.rpm"`"
 

diff --git a/cases/build/test_build_on_orphan_branch.case b/cases/build/test_build_on_orphan_branch.case
index eab956495661822e646bfb313a18e351b3250327..a2a57aa5e36ee1135e1090afcf0552a879b8cd3b 100644 (file)
--- a/cases/build/test_build_on_orphan_branch.case
+++ b/cases/build/test_build_on_orphan_branch.case
@@ -44,7 +44,7 @@ git commit -m "add all changes"
 gbs -c ../base.cfg build -A i586 2>&1
 
 # Check that build has been finished sucessful.
-test -n "`git status | grep "working directory clean"`"
+test -n "`git status | grep -E "working tree|directory clean"`"
 
 test -n "`find ~/GBS-ROOT/local/repos -name "*sw-tools*.rpm"`"
 ]]></steps>

diff --git a/cases/build/test_build_packaging-dir_ia32.case b/cases/build/test_build_packaging-dir_ia32.case
index 6334ac64a0a9de80bdf1afbaf46d2c292a4863c8..6eb50557816db74f4eccdca8946be2069ab3121d 100644 (file)
--- a/cases/build/test_build_packaging-dir_ia32.case
+++ b/cases/build/test_build_packaging-dir_ia32.case
@@ -31,7 +31,7 @@ cd ..
 test -n "`grep "init_buildsystem.*fake.spec" log`"
 
 #check source package whether changed or not
-cd fake && test -n "`git status | grep "working directory clean"`"
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`"
 
 #check rpm generated whether or not
 test -n "`find ~/GBS-ROOT/local/repos -name "*fake*.rpm"`"

diff --git a/cases/build/test_build_packaging-dir_multispec_ia32.case b/cases/build/test_build_packaging-dir_multispec_ia32.case
index 7bd83b2895d6036194b3b3eee41775301ede1654..a7be854bb82c18f254b285d506c5ecf3a39dd896 100644 (file)
--- a/cases/build/test_build_packaging-dir_multispec_ia32.case
+++ b/cases/build/test_build_packaging-dir_multispec_ia32.case
@@ -24,7 +24,7 @@ test -n "`grep "init_buildsystem.*fake.spec" log`"
 test -n "`grep "init_buildsystem.*fake-lib.spec" log`"
 
 #check source package whether changed or not
-cd fake && test -n "`git status | grep "working directory clean"`"
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`"
 
 #check rpm generated whether or not
 test -n "`find ~/GBS-ROOT/local/repos -name "*fake*.rpm"`"

diff --git a/cases/build/test_build_packaging-dir_spec_ia32.case b/cases/build/test_build_packaging-dir_spec_ia32.case
index 87ba671f169e2ae497a42f542f90b835abf3f3ac..0657b01f85a66391d6a58c1a3d921907e117db25 100644 (file)
--- a/cases/build/test_build_packaging-dir_spec_ia32.case
+++ b/cases/build/test_build_packaging-dir_spec_ia32.case
@@ -24,7 +24,7 @@ test -n "`grep "init_buildsystem.*fake-dev.spec" log`"
 test -z "`grep "init_buildsystem.*fake.spec" log`"
 
 #check source package whether changed or not
-cd fake && test -n "`git status | grep "working directory clean"`"
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`"
 
 #check rpm generated whether or not
 test -n "`find ~/GBS-ROOT/local/repos -name "*fake*.rpm"`"

diff --git a/cases/build/test_build_spec_ia32.case b/cases/build/test_build_spec_ia32.case
index 84182dd347890852eb99c37dee5acd70c6b7125d..0b68e37ad6c0044a743fae5adffb7d0d2a18bc98 100644 (file)
--- a/cases/build/test_build_spec_ia32.case
+++ b/cases/build/test_build_spec_ia32.case
@@ -28,7 +28,7 @@ test -n "`grep "init_buildsystem.*fake-dev.spec" log`"
 test -z "`grep "init_buildsystem.*fake.spec" log`"
 
 #check source package whether changed or not
-cd fake && test -n "`git status | grep "working directory clean"`"
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`"
 
 #check rpm generated whether or not
 test -n "`find ~/GBS-ROOT/local/repos -name "*fake*.rpm"`"

diff --git a/cases/build/test_build_spec_negative.case b/cases/build/test_build_spec_negative.case
index 7d472900d92a9e6578a77217e2aa816a604ec0d5..63756cd63e83adebf6a8020a20b4364b3436a535 100644 (file)
--- a/cases/build/test_build_spec_negative.case
+++ b/cases/build/test_build_spec_negative.case
@@ -20,6 +20,6 @@ sudo /bin/rm -rf ~/GBS-ROOT/local/repos
 test -n "`grep "gbs build.*error.*argument --spec" log`"
 
 #check source package whether changed or not
-cd fake && test -n "`git status | grep "working directory clean"`"
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`"
 ]]></steps>
 </testcase>

diff --git a/fixtures/tools/assert b/fixtures/tools/assert
index 28234fcf261f98057d9662b80050aab1bb3d5765..82f249e6478cc19cbafbbf757351569e8dc1cd2f 100644 (file)
--- a/fixtures/tools/assert
+++ b/fixtures/tools/assert
@@ -14,13 +14,13 @@ GBS_LOCAL_REPOS=~/GBS-ROOT/local/repos
 #assert git packages under current dir are clean
 function AssertClean()
 {
-    find . -maxdepth 1 -type d| sed "1d"| xargs -i sh -c "cd {};git status| grep 'working directory clean'"
+    find . -maxdepth 1 -type d| sed "1d"| xargs -i sh -c "cd {};git status| grep -E 'working tree|directory clean'"
 }
 #assert git package clean
 # such as: AssertCleanWith fake sw-tools
 function AssertCleanWith()
 {
-    echo $*| xargs -n1| xargs -i sh -c "cd {} && git status| grep 'working directory clean'"
+    echo $*| xargs -n1| xargs -i sh -c "cd {} && git status| grep -E 'working tree|directory clean'"
 }
 
 function AssertRPMsI()