Skip to content

Commit

Permalink
16435 util-tests setup fixes
Browse files Browse the repository at this point in the history
16437 workaround gerrit misclassifying awk test T.misc as binary
Reviewed by: Gordon Ross <Gordon.W.Ross@gmail.com>
Reviewed by: Andy Fiddaman <illumos@fiddaman.net>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Robert Mustacchi <rm@fingolfin.org>
  • Loading branch information
Bill-Sommerfeld authored and rmustacc committed Apr 6, 2024
1 parent eca3956 commit 8becd26
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
8 changes: 8 additions & 0 deletions usr/src/test/util-tests/runfiles/default.run
Expand Up @@ -26,8 +26,13 @@ post =
outputdir = /var/tmp/test_results

[/opt/util-tests/tests/printf_test]

[/opt/util-tests/tests/allowed-ips]
user = root

[/opt/util-tests/tests/set-linkprop]
user = root

[/opt/util-tests/tests/libsff/libsff]
[/opt/util-tests/tests/libjedec_test.32]
[/opt/util-tests/tests/libjedec_temp.32]
Expand Down Expand Up @@ -69,7 +74,10 @@ timeout = 300

[/opt/util-tests/tests/grep_test]
[/opt/util-tests/tests/date_test]

[/opt/util-tests/tests/chown_test]
user = root

[/opt/util-tests/tests/make_test]
[/opt/util-tests/tests/head/head_test]

Expand Down
4 changes: 2 additions & 2 deletions usr/src/test/util-tests/tests/awk/tests/T.misc
Expand Up @@ -307,7 +307,7 @@ $AWK '#
' >/dev/null 2> $TEMP0
grep 'line [45]' $TEMP0 >/dev/null || fail 'BAD: T.misc lineno'

echo 'x\y' > $TEMP1
echo 'x\r\y' > $TEMP1
$AWK 'BEGIN { print "x\f\r\b\v\a\\y" }' > $TEMP2
cmp -s $TEMP1 $TEMP2 || fail 'BAD: T.misc weird chars'

Expand Down Expand Up @@ -485,7 +485,7 @@ awk '{ print NF, $0 }' $TEMP0| tail -1 > $TEMP2
cmp -s $TEMP1 $TEMP2 || fail 'BAD: T.misc END must preserve $0'


LC_ALL= LC_NUMERIC=ru_RU.ISO8859-5 $AWK 'BEGIN {
LC_ALL= LC_NUMERIC=de_DE.UTF-8 $AWK 'BEGIN {
"echo 1,200" | getline;
if ($1 == 1.2) {
printf "good ";
Expand Down
4 changes: 3 additions & 1 deletion usr/src/test/util-tests/tests/date/date_test.ksh
Expand Up @@ -20,6 +20,8 @@

export LC_ALL=C

TMPDIR=${TMPDIR:-/tmp}

date_arg0="$(basename $0)"
date_prog=/usr/bin/date
date_curcmd=
Expand All @@ -42,7 +44,7 @@ compare()
date_curcmd="TZ=$3 $date_prog -r $1"
val=$(TZ=$3 $date_prog -r $1)
ret=$?
if [[ $ret -ne 0 ]]; then
if (( ret != 0 )); then
fatal "date not exit zero, exited $ret; command: $date_curcmd"
fi
if [[ -z "$val" ]]; then
Expand Down

0 comments on commit 8becd26

Please sign in to comment.