bash: fix package tests (#10165)

SPECS/bash/bash-tty-tests.patch

@@ -0,0 +1,58 @@
+diff --git a/tests/exec.right b/tests/exec.right
+--- a/tests/exec.right
++++ b/tests/exec.right
+@@ -60,7 +60,6 @@ this is ohio-state
+ 0
+ 1
+ testb
+-expand_aliases 	on
+ 1
+ 1
+ 1
+diff --git a/tests/execscript b/tests/execscript
+--- a/tests/execscript
++++ b/tests/execscript
+@@ -108,8 +108,6 @@ ${THIS_SH} ./exec6.sub
+ # checks for properly deciding what constitutes an executable file
+ ${THIS_SH} ./exec7.sub
+ 
+-${THIS_SH} -i ${PWD}/exec8.sub
+-
+ ${THIS_SH} ./exec9.sub
+ 
+ ${THIS_SH} ./exec10.sub
+diff --git a/tests/read.right b/tests/read.right
+--- a/tests/read.right
++++ b/tests/read.right
+@@ -34,17 +34,6 @@ xyz
+ a = xyz
+ a = -xyz 123-
+ a = abc
+-timeout 1: ok
+-unset or null 1
+-timeout 2: ok
+-unset or null 2
+-timeout 3: ok
+-unset or null 3
+-./read2.sub: line 45: read: -3: invalid timeout specification
+-1
+-
+-abcde
+-abcde
+ ./read3.sub: line 17: read: -1: invalid number
+ abc
+ defg
+diff --git a/tests/read.tests b/tests/read.tests
+--- a/tests/read.tests
++++ b/tests/read.tests
+@@ -95,9 +95,6 @@ echo " foo" | { IFS=$':' ; read line; recho "$line"; }
+ # test read -d delim behavior
+ ${THIS_SH} ./read1.sub
+ 
+-# test read -t timeout behavior
+-${THIS_SH} ./read2.sub
+-
+ # test read -n nchars behavior
+ ${THIS_SH} ./read3.sub
+ 
+ 

SPECS/bash/bash.spec

@@ -1,7 +1,7 @@
 Summary:        Bourne-Again SHell
 Name:           bash
 Version:        5.2.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv3
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -12,6 +12,7 @@ Source1:        bash_completion
 Patch0:         bash-5.1.patch
 # Non-interactive shells beginning with argv[0][0] == '-' should run the startup files when not in posix mode.
 Patch1:         bash-2.03-profile.patch
+Patch2:         bash-tty-tests.patch
 BuildRequires:  readline
 Requires:       readline
 Requires(post): /bin/cp
@@ -260,7 +261,10 @@ dircolors -p > %{buildroot}%{_sysconfdir}/dircolors
 rm -rf %{buildroot}/%{_infodir}
 
 %check
-make  NON_ROOT_USERNAME=nobody %{?_smp_mflags} check
+# Remove tests that get stuck waiting on /dev/tty input
+rm -v tests/run-read
+rm -v tests/run-history
+make check
 
 %post
 if [ $1 -eq 1 ] ; then
@@ -330,6 +334,9 @@ fi
 %defattr(-,root,root)
 
 %changelog
+* Fri Aug 16 2024 Andrew Phelps <anphel@microsoft.com> - 5.2.15-3
+- Fix check tests
+
 * Mon Jun 17 2024 Daniel McIlvaney <damcilva@microsoft.com> - 5.2.15-2
 - When non-interactive shells are started with '-bash' load startup files. From
 - Fedora upstream: https://src.fedoraproject.org/rpms/bash/blob/f40/f/bash-2.03-profile.patch

toolkit/resources/manifests/package/macros.override

@@ -14,7 +14,6 @@
 
 # Check hangs
 %skip_check_glibc 1
-%skip_check_bash 1
 %skip_check_gtk_doc 1
 %skip_check_tdnf 1
 %skip_check_vim 1

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -46,9 +46,9 @@ attr-2.5.2-1.azl3.aarch64.rpm
 libacl-2.3.1-2.azl3.aarch64.rpm
 coreutils-9.4-6.azl3.aarch64.rpm
 coreutils-lang-9.4-6.azl3.aarch64.rpm
-bash-5.2.15-2.azl3.aarch64.rpm
-bash-devel-5.2.15-2.azl3.aarch64.rpm
-bash-lang-5.2.15-2.azl3.aarch64.rpm
+bash-5.2.15-3.azl3.aarch64.rpm
+bash-devel-5.2.15-3.azl3.aarch64.rpm
+bash-lang-5.2.15-3.azl3.aarch64.rpm
 bzip2-1.0.8-1.azl3.aarch64.rpm
 bzip2-devel-1.0.8-1.azl3.aarch64.rpm
 bzip2-libs-1.0.8-1.azl3.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -46,9 +46,9 @@ attr-2.5.2-1.azl3.x86_64.rpm
 libacl-2.3.1-2.azl3.x86_64.rpm
 coreutils-9.4-6.azl3.x86_64.rpm
 coreutils-lang-9.4-6.azl3.x86_64.rpm
-bash-5.2.15-2.azl3.x86_64.rpm
-bash-devel-5.2.15-2.azl3.x86_64.rpm
-bash-lang-5.2.15-2.azl3.x86_64.rpm
+bash-5.2.15-3.azl3.x86_64.rpm
+bash-devel-5.2.15-3.azl3.x86_64.rpm
+bash-lang-5.2.15-3.azl3.x86_64.rpm
 bzip2-1.0.8-1.azl3.x86_64.rpm
 bzip2-devel-1.0.8-1.azl3.x86_64.rpm
 bzip2-libs-1.0.8-1.azl3.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -24,10 +24,10 @@ azurelinux-repos-ms-oss-preview-3.0-3.azl3.noarch.rpm
 azurelinux-repos-preview-3.0-3.azl3.noarch.rpm
 azurelinux-repos-shared-3.0-3.azl3.noarch.rpm
 azurelinux-rpm-macros-3.0-6.azl3.noarch.rpm
-bash-5.2.15-2.azl3.aarch64.rpm
-bash-debuginfo-5.2.15-2.azl3.aarch64.rpm
-bash-devel-5.2.15-2.azl3.aarch64.rpm
-bash-lang-5.2.15-2.azl3.aarch64.rpm
+bash-5.2.15-3.azl3.aarch64.rpm
+bash-debuginfo-5.2.15-3.azl3.aarch64.rpm
+bash-devel-5.2.15-3.azl3.aarch64.rpm
+bash-lang-5.2.15-3.azl3.aarch64.rpm
 binutils-2.41-2.azl3.aarch64.rpm
 binutils-debuginfo-2.41-2.azl3.aarch64.rpm
 binutils-devel-2.41-2.azl3.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -24,10 +24,10 @@ azurelinux-repos-ms-oss-preview-3.0-3.azl3.noarch.rpm
 azurelinux-repos-preview-3.0-3.azl3.noarch.rpm
 azurelinux-repos-shared-3.0-3.azl3.noarch.rpm
 azurelinux-rpm-macros-3.0-6.azl3.noarch.rpm
-bash-5.2.15-2.azl3.x86_64.rpm
-bash-debuginfo-5.2.15-2.azl3.x86_64.rpm
-bash-devel-5.2.15-2.azl3.x86_64.rpm
-bash-lang-5.2.15-2.azl3.x86_64.rpm
+bash-5.2.15-3.azl3.x86_64.rpm
+bash-debuginfo-5.2.15-3.azl3.x86_64.rpm
+bash-devel-5.2.15-3.azl3.x86_64.rpm
+bash-lang-5.2.15-3.azl3.x86_64.rpm
 binutils-2.41-2.azl3.x86_64.rpm
 binutils-aarch64-linux-gnu-2.41-2.azl3.x86_64.rpm
 binutils-debuginfo-2.41-2.azl3.x86_64.rpm