← Commit list

007ce9f80

Denys Vlasenko
Denys Vlasenko
2017-08-13
SUCCESS Duration: 144s

Subject

shell: tweak getopts tests, no code changes

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

shell/ash_test/ash-getopts/getopt_test_libc_bug.tests +2 -2shell/hush_test/hush-getopts/getopt_optarg.tests +6 -0shell/hush_test/hush-getopts/getopt_positional.tests +6 -0shell/hush_test/hush-getopts/getopt_silent.tests +6 -0shell/hush_test/hush-getopts/getopt_simple.tests +6 -0shell/hush_test/hush-getopts/getopt_test_libc_bug.tests +8 -2
shell/ash_test/ash-getopts/getopt_test_libc_bug.tests+2 -2
@@ -1,6 +1,6 @@
# This test can fail with libc with buggy getopt() implementation.
# If getopt() wants to parse multi-option args (-abc),
-# it needs to remember a position withit current arg.
+# it needs to remember a position within current arg.
#
# If this position is kept as a POINTER, not an offset,
# and if argv[] ADDRESSES (not contents!) change, it blows up.
@@ -24,7 +24,7 @@ VAR111=NEWVAL; getopts "ac" var -a -b -c -d e; echo "3 rc:$? var:'$var' OPTIND:$
VAR222=NEWVAL; getopts "ac" var -a -b -c -d e; echo "4 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
VAR333=NEWVAL; getopts "ac" var -a -b -c -d e; echo "5 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
-# Sligntly different attempts to force reallocations
+# Slightly different attempts to force reallocations
echo
echo "*** optstring:'ac' args:-a -b -c -d e"
shell/hush_test/hush-getopts/getopt_optarg.tests+6 -0
@@ -1,3 +1,5 @@
+(
+
set -- -q -w e -r -t -y
echo "*** no OPTIND, optstring:'w:et' args:$*"
var=QWERTY
@@ -16,3 +18,7 @@ while getopts "w:et" var; do
OPTARG=ASDFGH
done
echo "exited: var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+
+) 2>&1 \
+| sed -e 's/ unrecognized option: / invalid option -- /' \
+ -e 's/ illegal option -- / invalid option -- /' \
shell/hush_test/hush-getopts/getopt_positional.tests+6 -0
@@ -1,3 +1,5 @@
+(
+
set -- -q -w -e r -t -y
echo "*** no OPTIND, optstring:'we' args:$*"
var=QWERTY
@@ -5,3 +7,7 @@ while getopts "we" var; do
echo "var:'$var' OPTIND:$OPTIND"
done
echo "exited: var:'$var' OPTIND:$OPTIND"
+
+) 2>&1 \
+| sed -e 's/ unrecognized option: / invalid option -- /' \
+ -e 's/ illegal option -- / invalid option -- /' \
shell/hush_test/hush-getopts/getopt_silent.tests+6 -0
@@ -11,6 +11,8 @@
# and OPTARG shall be set to the option character found.
# """
+(
+
echo "*** optstring:':ac' args:-a -b -c"
getopts ":ac" var -a -b -c; echo "1 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
getopts ":ac" var -a -b -c; echo "2 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
@@ -21,3 +23,7 @@ getopts ":ac" var -a -b -c; echo "4 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPT
# Nevertheless, let's verify that calling it yet another time doesn't do
# anything weird:
getopts ":ac" var -a -b -c; echo "5 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+
+) 2>&1 \
+| sed -e 's/ unrecognized option: / invalid option -- /' \
+ -e 's/ illegal option -- / invalid option -- /' \
shell/hush_test/hush-getopts/getopt_simple.tests+6 -0
@@ -10,6 +10,8 @@
# We check that loop does not stop on unknown option (sets "?"),
# stops on _first_ non-option argument.
+(
+
echo "*** no OPTIND, optstring:'ab' args:-a -b c"
var=QWERTY
while getopts "ab" var -a -b c; do
@@ -73,3 +75,7 @@ while getopts "ab" var -a -c -b d; do
echo "var:'$var' OPTIND:$OPTIND"
done
echo "exited: rc:$? var:'$var' OPTIND:$OPTIND"
+
+) 2>&1 \
+| sed -e 's/ unrecognized option: / invalid option -- /' \
+ -e 's/ illegal option -- / invalid option -- /' \
shell/hush_test/hush-getopts/getopt_test_libc_bug.tests+8 -2
@@ -1,10 +1,12 @@
# This test can fail with libc with buggy getopt() implementation.
# If getopt() wants to parse multi-option args (-abc),
-# it needs to remember a position withit current arg.
+# it needs to remember a position within current arg.
#
# If this position is kept as a POINTER, not an offset,
# and if argv[] ADDRESSES (not contents!) change, it blows up.
+(
+
echo "*** optstring:'ac' args:-a -b -c -d e"
getopts "ac" var -a -b -c -d e; echo "1 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
getopts "ac" var -a -b -c -d e; echo "2 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
@@ -24,7 +26,7 @@ VAR111=NEWVAL; getopts "ac" var -a -b -c -d e; echo "3 rc:$? var:'$var' OPTIND:$
VAR222=NEWVAL; getopts "ac" var -a -b -c -d e; echo "4 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
VAR333=NEWVAL; getopts "ac" var -a -b -c -d e; echo "5 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
-# Sligntly different attempts to force reallocations
+# Slightly different attempts to force reallocations
echo
echo "*** optstring:'ac' args:-a -b -c -d e"
@@ -36,3 +38,7 @@ export VAR222; getopts "ac" var -a -b -c -d e; echo "4 rc:$? var:'$var' OPTIND:$
export VAR333; getopts "ac" var -a -b -c -d e; echo "5 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
# All copies of code above should generate identical output
+
+) 2>&1 \
+| sed -e 's/ unrecognized option: / invalid option -- /' \
+ -e 's/ illegal option -- / invalid option -- /' \