summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Levon <john.levon@joyent.com>2020-04-01 16:43:14 +0100
committerGitHub <noreply@github.com>2020-04-01 16:43:14 +0100
commitee42d232c75feb49ab18a118a8a3b7fc3ea9f0c4 (patch)
tree57ccba9faa7b25da0ab082799ac1d41fe9447caa
parentf559d4b8282f7f6a9c3e1546000352c62e12481a (diff)
downloadillumos-joyent-ee42d232c75feb49ab18a118a8a3b7fc3ea9f0c4.tar.gz
OS-8148 ignore some failing dis tests (#276)
Reviewed by: Tim Foster <tim.foster@joyent.com> Approved by: Tim Foster <tim.foster@joyent.com>
-rw-r--r--usr/src/test/util-tests/tests/dis/distest.ksh23
1 files changed, 20 insertions, 3 deletions
diff --git a/usr/src/test/util-tests/tests/dis/distest.ksh b/usr/src/test/util-tests/tests/dis/distest.ksh
index 37a5dd231a..f32f858ef1 100644
--- a/usr/src/test/util-tests/tests/dis/distest.ksh
+++ b/usr/src/test/util-tests/tests/dis/distest.ksh
@@ -11,7 +11,7 @@
#
#
-# Copyright 2018 Joyent, Inc.
+# Copyright 2020 Joyent, Inc.
#
#
@@ -50,6 +50,7 @@ dt_nodefault=
dt_tests=
dt_tnum=0
dt_tfail=0
+dt_txfail=0
dt_tsuc=0
dt_origwd=
dt_root=
@@ -141,10 +142,25 @@ handle_failure()
mv $dir $faildir
cp $source $faildir/
cp $out $faildir/
- printf "%s " "failed "
+
+ #
+ # Our pkgsrc gas is too old (2.26.1) to assemble these.
+ #
+ xfails=("32.vaes.s" "32.gfni.s" "32.avx512_vpclmulqdq.s"
+ "64.vaes.s" "64.gfni.s" "64.avx512_vpclmulqdq.s")
+ testname=$(basename $source)
+ printf '%s\n' ${xfails[@]} | grep "^$testname$" >/dev/null
+
+ if [[ $? -eq 0 ]]; then
+ printf "%s " "expected fail "
+ ((dt_txfail++))
+ else
+ printf "%s " "failed "
+ ((dt_tfail++))
+ fi
+
[[ -n $reason ]] && printf "%s " $reason
printf "%s\n" "$faildir"
- ((dt_tfail++))
}
#
@@ -271,6 +287,7 @@ libdis Results
Tests passed: $dt_tsuc
Tests failed: $dt_tfail
+Tests expected to fail: $dt_txfail
Tests ran: $dt_tnum
EOF
}