9 files changed, 16 insertions, 17 deletions

diff --git a/meta/classes/distutils-tools.bbclass b/meta/classes/distutils-tools.bbclass
index 3ef9cc5a78..6f2880ea01 100644
--- a/meta/classes/distutils-tools.bbclass
+++ b/meta/classes/distutils-tools.bbclass
@@ -63,7 +63,7 @@ distutils_do_install() {
         #
         # FIXME: Bandaid against wrong datadir computation
         #
-        if test -e ${D}${datadir}/share; then
+        if [ -e ${D}${datadir}/share ]; then
             mv -f ${D}${datadir}/share/* ${D}${datadir}/
         fi
 }
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index 857572d759..e5abdd1216 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -50,7 +50,7 @@ distutils_do_install() {
             done
         fi
 
-        if test -e ${D}${sbindir}; then
+        if [ -e ${D}${sbindir} ]; then
             for i in ${D}${sbindir}/* ; do \
                 if [ ${PN} != "${BPN}-native" ]; then
                         sed -i -e s:${STAGING_BINDIR_NATIVE}/python-native/python:${bindir}/env\ python:g $i
@@ -65,13 +65,13 @@ distutils_do_install() {
         #
         # FIXME: Bandaid against wrong datadir computation
         #
-        if test -e ${D}${datadir}/share; then
+        if [ -e ${D}${datadir}/share ]; then
             mv -f ${D}${datadir}/share/* ${D}${datadir}/
             rmdir ${D}${datadir}/share
         fi
 
         # Fix backport modules
-        if test -e ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/backports/__init__.py && test -e ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.py; then
+        if [ -e ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/backports/__init__.py ] && [ -e ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.py ]; then
            rm ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.py;
            rm ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.pyc;
         fi
diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass
index a6720c5b6b..01ef72a987 100644
--- a/meta/classes/distutils3.bbclass
+++ b/meta/classes/distutils3.bbclass
@@ -64,7 +64,7 @@ distutils3_do_install() {
         #
         # FIXME: Bandaid against wrong datadir computation
         #
-        if test -e ${D}${datadir}/share; then
+        if [ -e ${D}${datadir}/share ]; then
             mv -f ${D}${datadir}/share/* ${D}${datadir}/
             rmdir ${D}${datadir}/share
         fi
diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass
index 42bbd73cf8..85f71a2e9a 100644
--- a/meta/classes/go.bbclass
+++ b/meta/classes/go.bbclass
@@ -36,7 +36,7 @@ GO_INSTALL ?= "${GO_IMPORT}/..."
 
 do_go_compile() {
         GOPATH=${S}:${STAGING_LIBDIR}/${TARGET_SYS}/go go env
-        if test -n "${GO_INSTALL}" ; then
+        if [ -n "${GO_INSTALL}" ]; then
                 GOPATH=${S}:${STAGING_LIBDIR}/${TARGET_SYS}/go go install -v ${GO_INSTALL}
         fi
 }
@@ -61,7 +61,7 @@ do_go_install() {
 
         chown -R root:root "${D}${GOROOT_FINAL}"
 
-        if test -e "${D}${GOBIN_FINAL}" ; then
+        if [ -e "${D}${GOBIN_FINAL}" ]; then
                 install -d -m 0755 "${D}${bindir}"
                 find "${D}${GOBIN_FINAL}" ! -type d -print0 | xargs -r0 mv --target-directory="${D}${bindir}"
                 rmdir -p "${D}${GOBIN_FINAL}" || true
diff --git a/meta/classes/gtk-doc.bbclass b/meta/classes/gtk-doc.bbclass
index 297eac63b7..0ae2729c0a 100644
--- a/meta/classes/gtk-doc.bbclass
+++ b/meta/classes/gtk-doc.bbclass
@@ -50,7 +50,7 @@ export GIO_MODULE_DIR=${STAGING_LIBDIR}/gio/modules-dummy
 
 GIR_EXTRA_LIBS_PATH=\`find ${B} -name .libs| tr '\n' ':'\`\$GIR_EXTRA_LIBS_PATH
 
-if test -d ".libs"; then
+if [ -d ".libs" ]; then
     $qemu_binary ".libs/\$@"
 else
     $qemu_binary "\$@"
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 2d344b52cd..8ae2eb6df5 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -96,7 +96,7 @@ fitimage_emit_section_kernel() {
         kernel_csum="sha1"
 
         ENTRYPOINT=${UBOOT_ENTRYPOINT}
-        if test -n "${UBOOT_ENTRYSYMBOL}"; then
+        if [ -n "${UBOOT_ENTRYSYMBOL}" ]; then
                 ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
                         awk '$4=="${UBOOT_ENTRYSYMBOL}" {print $2}'`
         fi
@@ -339,7 +339,7 @@ fitimage_assemble() {
         #
         # Step 2: Prepare a DTB image section
         #
-        if test -n "${KERNEL_DEVICETREE}"; then
+        if [ -n "${KERNEL_DEVICETREE}" ]; then
                 dtbcount=1
                 for DTB in ${KERNEL_DEVICETREE}; do
                         if echo ${DTB} | grep -q '/dts/'; then
@@ -359,7 +359,7 @@ fitimage_assemble() {
         #
         # Step 3: Prepare a setup section. (For x86)
         #
-        if test -e arch/${ARCH}/boot/setup.bin ; then
+        if [ -e arch/${ARCH}/boot/setup.bin ]; then
                 setupcount=1
                 fitimage_emit_section_setup ${1} "${setupcount}" arch/${ARCH}/boot/setup.bin
         fi
@@ -383,7 +383,7 @@ fitimage_assemble() {
 
         # Force the first Kernel and DTB in the default config
         kernelcount=1
-        if test -n "${dtbcount}"; then
+        if [ -n "${dtbcount}" ]; then
                 dtbcount=1
         fi
 
@@ -392,7 +392,7 @@ fitimage_assemble() {
         #
         fitimage_emit_section_maint ${1} confstart
 
-        if test -n "${DTBS}"; then
+        if [ -n "${DTBS}" ]; then
                 i=1
                 for DTB in ${DTBS}; do
                         fitimage_emit_section_config ${1} "${kernelcount}" "${DTB}" "${ramdiskcount}" "${setupcount}" "`expr ${i} = ${dtbcount}`"
diff --git a/meta/classes/kernel-uboot.bbclass b/meta/classes/kernel-uboot.bbclass
index 345e7f5f3b..868e97d7a7 100644
--- a/meta/classes/kernel-uboot.bbclass
+++ b/meta/classes/kernel-uboot.bbclass
@@ -1,5 +1,5 @@
 uboot_prep_kimage() {
-        if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
+        if [ -e arch/${ARCH}/boot/compressed/vmlinux ]; then
                 vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux"
                 linux_suffix=""
                 linux_comp="none"
diff --git a/meta/classes/kernel-uimage.bbclass b/meta/classes/kernel-uimage.bbclass
index 7e7185f903..e2e9b63110 100644
--- a/meta/classes/kernel-uimage.bbclass
+++ b/meta/classes/kernel-uimage.bbclass
@@ -23,7 +23,7 @@ do_uboot_mkimage() {
                         uboot_prep_kimage
 
                         ENTRYPOINT=${UBOOT_ENTRYPOINT}
-                        if test -n "${UBOOT_ENTRYSYMBOL}"; then
+                        if [ -n "${UBOOT_ENTRYSYMBOL}" ]; then
                                 ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
                                         awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
                         fi
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index dd3cac5d69..563582e0a0 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -246,8 +246,7 @@ populate_sdk_log_check() {
 
                 echo "log_check: Using $lf_path as logfile"
 
-                if test -e "$lf_path"
-                then
+                if [ -e "$lf_path" ]; then
                         ${IMAGE_PKGTYPE}_log_check $target $lf_path
                 else
                         echo "Cannot find logfile [$lf_path]"