@@ -89,7 +89,6 @@ python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}

 %check

 easy_install_2=$(ls /usr/bin |grep easy_install |grep 2)

-mount -t devpts -o gid=4,mode=620 none /dev/pts

 route add -net 224.0.0.0 netmask 240.0.0.0 dev lo

 $easy_install_2 pip

 pip install --upgrade tox

@@ -1,7 +1,7 @@

 Summary:        A high-level scripting language

 Name:           python2

 Version:        2.7.13

-Release:        8%{?dist}

+Release:        9%{?dist}

 License:        PSF

 URL:            http://www.python.org/

 Group:          System Environment/Programming

@@ -155,7 +155,6 @@ find %{buildroot}%{_libdir} -name '*.pyo' -delete

 rm -rf %{buildroot}/*

 %check

-mount -t devpts -o gid=4,mode=620 none /dev/pts

 make test

 %files 

@@ -237,6 +236,8 @@ make test

 %{_libdir}/python2.7/test/*

 %changelog

+*   Fri Sep 15 2017 Bo Gan <ganb@vmware.com> 2.7.13-9

+-   Remove devpts mount in check

 *   Mon Aug 28 2017 Chang Lee <changlee@vmware.com> 2.7.13-8

 -   Add %check with pty

 *   Wed Jul 12 2017 Xiaolin Li <xiaolinl@vmware.com> 2.7.13-7

@@ -1,7 +1,7 @@

 Summary:        A high-level scripting language

 Name:           python3

 Version:        3.6.1

-Release:        7%{?dist}

+Release:        8%{?dist}

 License:        PSF

 URL:            http://www.python.org/

 Group:          System Environment/Programming

@@ -164,7 +164,6 @@ find %{buildroot}%{_libdir} -name '*.o' -delete

 rm %{buildroot}%{_bindir}/2to3

 %check

-mount -t devpts -o gid=4,mode=620 none /dev/pts

 make  %{?_smp_mflags} test

 %post -p /sbin/ldconfig

@@ -264,6 +263,8 @@ rm -rf %{buildroot}/*

 %{_libdir}/python3.6/test/*

 %changelog

+*   Fri Sep 15 2017 Bo Gan <ganb@vmware.com> 3.6.1-8

+-   Remove devpts mount in check

 *   Mon Aug 28 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.6.1-7

 -   Add pty for tests to pass

 *   Wed Jul 12 2017 Xiaolin Li <xiaolinl@vmware.com> 3.6.1-6

@@ -1,7 +1,7 @@

 Summary:        Utilities for file systems, consoles, partitions, and messages

 Name:           util-linux

 Version:        2.29.2

-Release:        3%{?dist}

+Release:        4%{?dist}

 URL:            http://www.kernel.org/pub/linux/utils/util-linux

 License:        GPLv2+

 Group:          Applications/System

@@ -59,10 +59,7 @@ find %{buildroot} -name '*.la' -delete

 %check

 chown -Rv nobody .

-echo "none  /dev/pts devpts" >> /etc/fstab

-mount /dev/pts

 sudo -u nobody -s /bin/bash -c "PATH=$PATH make -k check"

-umount /dev/pts

 rm -rf %{buildroot}/lib/systemd/system

 %post   -p /sbin/ldconfig

@@ -99,6 +96,8 @@ rm -rf %{buildroot}/lib/systemd/system

 %{_mandir}/man3/*

 %changelog

+*   Fri Sep 15 2017 Bo Gan <ganb@vmware.com> 2.29.2-4

+-   Cleanup check

 *   Mon Jul 31 2017 Xiaolin Li <xiaolinl@vmware.com> 2.29.2-3

 -   Fixed rpm check errors.

 *   Thu Apr 20 2017 Alexey Makhalov <amakhalov@vmware.com> 2.29.2-2

@@ -1,7 +1,7 @@

 Summary:        library for fast, message-based applications

 Name:           zeromq

 Version:        4.1.4

-Release:        2%{?dist}

+Release:        3%{?dist}

 URL:            http://www.zeromq.org

 License:        LGPLv3+

 Group:          System Environment/Libraries

@@ -38,8 +38,7 @@ make DESTDIR=%{buildroot} install

 find %{buildroot}%{_libdir} -name '*.la' -delete

 %check

-mount -t devpts -o gid=4,mode=620 none /dev/pts

-ulimit -n 1200 && make check

+make check

 %post   -p /sbin/ldconfig

 %postun -p /sbin/ldconfig

@@ -58,6 +57,8 @@ ulimit -n 1200 && make check

 %{_mandir}/*

 %changelog

+*   Fri Sep 15 2017 Bo Gan <ganb@vmware.com> 4.1.4-3

+-   Remove devpts mount

 *   Mon Aug 07 2017 Chang Lee <changlee@vmware.com> 4.1.4-2

 -   Fixed %check

 *   Thu Apr 13 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.1.4-1

@@ -3,7 +3,7 @@

 Summary:      Z shell

 Name:         zsh

 Version:      5.3.1

-Release:      2%{?dist}

+Release:      3%{?dist}

 License:      MIT

 URL:          http://zsh.sourceforge.net/

 Group:        System Environment/Shells

@@ -68,15 +68,8 @@ export LIBLDFLAGS='-z lazy'

 make all html

 %check

-#Ubuntu dev machine can have different test failures like Y01completion.ztst, Y02compmatch.ztst, and Y03arguments.ztst

-if `uname -a | grep photon`;then

-    mount -t devpts -o gid=4,mode=620 none /dev/pts

-    #Skip the C02cond.ztst that failed in Phootn OS chroot.

-    rm -f Test/C02cond.ztst

-    make check

-else

-    echo '*** The chroot file system from other OSes does not support all zsh test cases ***'

-fi

+rm -f Test/C02cond.ztst

+make check

 %install

 rm -rf $RPM_BUILD_ROOT

@@ -151,6 +144,8 @@ fi

 %doc Doc/*.html

 %changelog

+*   Fri Sep 15 2017 Bo Gan <ganb@vmware.com> 5.3.1-3

+-   Clean up check

 *   Wed Aug 02 2017 Chang Lee <changlee@vmware.com> 5.3.1-2

 -   Skip a test case that is not supported from photon OS chroot

 *   Wed Apr 05 2017 Xiaolin Li <xiaolinl@vmware.com> 5.3.1-1

@@ -26,8 +26,7 @@ LOGFILE=/var/log/"${PRGNAME}-${LOGFILE}"    #   set log file name

 if mountpoint ${BUILDROOT}/run  >/dev/null 2>&1; then umount ${BUILDROOT}/run; fi

 if mountpoint ${BUILDROOT}/sys  >/dev/null 2>&1; then umount ${BUILDROOT}/sys; fi

 if mountpoint ${BUILDROOT}/proc >/dev/null 2>&1; then umount ${BUILDROOT}/proc; fi

-if mountpoint ${BUILDROOT}/dev/pts  >/dev/null 2>&1; then umount ${BUILDROOT}/dev/pts; fi

-if mountpoint ${BUILDROOT}/dev  >/dev/null 2>&1; then umount ${BUILDROOT}/dev; fi

+if mountpoint ${BUILDROOT}/dev  >/dev/null 2>&1; then umount -R ${BUILDROOT}/dev; fi

 [ ${EUID} -eq 0 ]   || fail "${PRGNAME}: Need to be root user: FAILURE"

 cd ${BUILDROOT} || fail "${PRGNAME}: Change directory: ${BUILDROOT}: FAILURE"

@@ -64,8 +63,7 @@ fi

 #

 #   Mount kernel filesystem

 #

-if ! mountpoint ${BUILDROOT}/dev    >/dev/null 2>&1; then mount --bind /dev ${BUILDROOT}/dev; fi

-if ! mountpoint ${BUILDROOT}/dev/pts    >/dev/null 2>&1; then mount -t devpts devpts ${BUILDROOT}/dev/pts -o gid=5,mode=620; fi

+if ! mountpoint ${BUILDROOT}/dev    >/dev/null 2>&1; then mount --rbind /dev ${BUILDROOT}/dev; mount --make-rslave ${BUILDROOT}/dev; fi

 if ! mountpoint ${BUILDROOT}/proc   >/dev/null 2>&1; then mount -t proc proc ${BUILDROOT}/proc; fi

 if ! mountpoint ${BUILDROOT}/sys    >/dev/null 2>&1; then mount -t sysfs sysfs ${BUILDROOT}/sys; fi

 if ! mountpoint ${BUILDROOT}/run    >/dev/null 2>&1; then mount -t tmpfs tmpfs ${BUILDROOT}/run; fi

@@ -23,8 +23,7 @@ LOGFILE=/var/log/"${PRGNAME}-${LOGFILE}"    #   set log file name

 if mountpoint ${BUILDROOT}/run >/dev/null 2>&1; then umount ${BUILDROOT}/run; fi

 if mountpoint ${BUILDROOT}/sys >/dev/null 2>&1; then umount ${BUILDROOT}/sys; fi

 if mountpoint ${BUILDROOT}/proc    >/dev/null 2>&1; then umount ${BUILDROOT}/proc; fi

-if mountpoint ${BUILDROOT}/dev/pts >/dev/null 2>&1; then umount ${BUILDROOT}/dev/pts; fi

-if mountpoint ${BUILDROOT}/dev >/dev/null 2>&1; then umount ${BUILDROOT}/dev; fi

+if mountpoint ${BUILDROOT}/dev >/dev/null 2>&1; then umount -R ${BUILDROOT}/dev; fi

 while [[ $# > 0 ]]

 do

@@ -156,8 +156,8 @@ if __name__ == '__main__':

             shutil.rmtree(additional_rpms_path, ignore_errors=True)

         utils.runshellcommand("mount -o bind /proc {}".format(options.mount_path + "/proc"))

-        utils.runshellcommand("mount -o bind /dev {}".format(options.mount_path + "/dev"))

-        utils.runshellcommand("mount -o bind /dev/pts {}".format(options.mount_path + "/dev/pts"))

+        utils.runshellcommand("mount -o rbind /dev {}".format(options.mount_path + "/dev"))

+        utils.runshellcommand("mount --make-rslave {}".format(options.mount_path + "/dev"))

         utils.runshellcommand("mount -o bind /sys {}".format(options.mount_path + "/sys"))

         if 'additionalfiles' in config:

@@ -179,8 +179,7 @@ if __name__ == '__main__':

             shutil.rmtree(options.mount_path + "/tempscripts", ignore_errors=True)

         utils.runshellcommand("umount -l {}".format(options.mount_path + "/sys"))

-        utils.runshellcommand("umount -l {}".format(options.mount_path + "/dev/pts"))

-        utils.runshellcommand("umount -l {}".format(options.mount_path + "/dev"))

+        utils.runshellcommand("umount -R -l {}".format(options.mount_path + "/dev"))

         utils.runshellcommand("umount -l {}".format(options.mount_path + "/proc"))

         utils.runshellcommand("umount -l {}".format(options.mount_path))

@@ -24,8 +24,7 @@ PARENT=/usr/src/photon

 if mountpoint ${BUILDROOT}/run	>/dev/null 2>&1; then umount ${BUILDROOT}/run; fi

 if mountpoint ${BUILDROOT}/sys	>/dev/null 2>&1; then umount ${BUILDROOT}/sys; fi

 if mountpoint ${BUILDROOT}/proc	>/dev/null 2>&1; then umount ${BUILDROOT}/proc; fi

-#if mountpoint ${BUILDROOT}/dev/pts	>/dev/null 2>&1; then umount ${BUILDROOT}/dev/pts; fi

-if mountpoint ${BUILDROOT}/dev	>/dev/null 2>&1; then umount ${BUILDROOT}/dev; fi

+if mountpoint ${BUILDROOT}/dev	>/dev/null 2>&1; then umount -R ${BUILDROOT}/dev; fi

 #copy localegen files.

@@ -45,8 +44,7 @@ if [ ${EUID} -eq 0 ] ; then

 #

 #	Mount kernel filesystem

 #

-    if ! mountpoint ${BUILDROOT}/dev	>/dev/null 2>&1; then mount --bind /dev ${BUILDROOT}/dev; fi

-#    if ! mountpoint ${BUILDROOT}/dev/pts	>/dev/null 2>&1; then mount -t devpts devpts ${BUILDROOT}/dev/pts -o gid=5,mode=620; fi

+    if ! mountpoint ${BUILDROOT}/dev	>/dev/null 2>&1; then mount --rbind /dev ${BUILDROOT}/dev; mount --make-rslave ${BUILDROOT}/dev; fi

     if ! mountpoint ${BUILDROOT}/proc	>/dev/null 2>&1; then mount -t proc proc ${BUILDROOT}/proc; fi

     if ! mountpoint ${BUILDROOT}/sys 	>/dev/null 2>&1; then mount -t sysfs sysfs ${BUILDROOT}/sys; fi

     if ! mountpoint ${BUILDROOT}/run	>/dev/null 2>&1; then mount -t tmpfs tmpfs ${BUILDROOT}/run; fi

@@ -27,8 +27,7 @@ if [ ${EUID} -eq 0 ] ; then

     if mountpoint ${BUILDROOT}/run	>/dev/null 2>&1; then umount ${BUILDROOT}/run; fi

     if mountpoint ${BUILDROOT}/sys	>/dev/null 2>&1; then umount ${BUILDROOT}/sys; fi

     if mountpoint ${BUILDROOT}/proc	>/dev/null 2>&1; then umount ${BUILDROOT}/proc; fi

-    if mountpoint ${BUILDROOT}/dev/pts	>/dev/null 2>&1; then umount ${BUILDROOT}/dev/pts; fi

-    if mountpoint ${BUILDROOT}/dev	>/dev/null 2>&1; then umount ${BUILDROOT}/dev; fi

+    if mountpoint ${BUILDROOT}/dev	>/dev/null 2>&1; then umount -R ${BUILDROOT}/dev; fi

 fi

 exit 0