Adding upstream version 9.4.upstream/9.4upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 129 insertions, 0 deletions

diff --git a/tests/nproc/nproc-avail.sh b/tests/nproc/nproc-avail.sh
new file mode 100755
index 0000000..271ba6a
--- /dev/null
+++ b/tests/nproc/nproc-avail.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+# Ensure that "nproc" is less than or equal to "nproc --all".
+
+# Copyright (C) 2009-2023 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ nproc
+
+all=$(nproc --all)
+available=$(OMP_NUM_THREADS= nproc)
+
+test $available -le $all || fail=1
+
+Exit $fail
diff --git a/tests/nproc/nproc-override.sh b/tests/nproc/nproc-override.sh
new file mode 100755
index 0000000..e643bc3
--- /dev/null
+++ b/tests/nproc/nproc-override.sh
@@ -0,0 +1,58 @@
+#!/bin/sh
+# Test the various OpenMP override options
+
+# Copyright (C) 2017-2023 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ nproc
+
+unset OMP_NUM_THREADS
+unset OMP_THREADS_LIMIT
+
+avail=$(nproc) || fail=1
+test $(($avail > 0)) || fail=1
+
+#OMP_THREAD_LIMIT       OMP_NUM_THREADS     NPROC
+echo "\
+ -                      -                   $avail
+ 1                      -                   1
+ 1                      0                   1
+ -                      0                   $avail
+ -                      2,2,1               2
+ -                      2,ignored           2
+ -                      2bad                $avail
+ -                      -2                  $avail
+ 1                      2,2,1               1
+ 0                      2,2,1               2
+ 1bad                   2,2,1               2
+ 1bad                   $(($avail+1)),2,1   $(($avail+1))
+ 1                      $(($avail+1))       1
+ $(($avail+2))          $(($avail+1))       $(($avail+1))
+ $(($avail+1))          $(($avail+2))       $(($avail+1))
+ -                      $(($avail+1))       $(($avail+1))" |
+
+while read OMP_THREAD_LIMIT OMP_NUM_THREADS NPROC; do
+  test $OMP_THREAD_LIMIT = '-' && unset OMP_THREAD_LIMIT
+  test $OMP_NUM_THREADS = '-' && unset OMP_NUM_THREADS
+  export OMP_THREAD_LIMIT
+  export OMP_NUM_THREADS
+  test $(nproc) = $NPROC ||
+    echo "[$OMP_THREAD_LIMIT] [$OMP_NUM_THREADS]" >> failed
+done
+
+test -e failed && fail=1
+
+Exit $fail
diff --git a/tests/nproc/nproc-positive.sh b/tests/nproc/nproc-positive.sh
new file mode 100755
index 0000000..d4936a1
--- /dev/null
+++ b/tests/nproc/nproc-positive.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Ensure that nproc prints a number > 0
+
+# Copyright (C) 2009-2023 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ nproc
+
+for mode in --all ''; do
+    procs=$(nproc $mode)
+    test "$procs" -gt 0 || fail=1
+done
+
+for i in -1000 0 1 1000; do
+    procs=$(OMP_NUM_THREADS=$i nproc)
+    test "$procs" -gt 0 || fail=1
+done
+
+for i in 0 ' 1' 1000; do
+    procs=$(nproc --ignore="$i")
+    test "$procs" -gt 0 || fail=1
+done
+
+for i in -1 N; do
+    returns_ 1 nproc --ignore=$i || fail=1
+done
+
+procs=$(OMP_NUM_THREADS=42 nproc --ignore=40)
+test "$procs" -eq 2 || fail=1
+
+Exit $fail