Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tests/scripts/components-platform.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ component_test_aesni () { # ~ 60s
make clean
make CC=gcc CFLAGS='-O2 -Werror'
# check that there is no AESNI code present
./programs/test/selftest aes | not grep -q "AESNI code"
./programs/test/selftest aes | not grep -q "AESNI code" -
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I hadn't realized that we were sometimes grepping on a pipe. I'll change /dev/null to -H so that the behavior with a pipe isn't surprising.

not grep -q "AES note: using AESNI" ./programs/test/selftest
grep -q "AES note: built-in implementation." ./programs/test/selftest

Expand All @@ -68,8 +68,8 @@ component_test_aesni () { # ~ 60s
msg "AES tests, test AESNI only"
make clean
make CC=gcc CFLAGS='-Werror -Wall -Wextra -mpclmul -msse2 -maes'
./programs/test/selftest aes | grep -q "AES note: using AESNI"
./programs/test/selftest aes | not grep -q "AES note: built-in implementation."
./programs/test/selftest aes | grep -q "AES note: using AESNI" -
./programs/test/selftest aes | not grep -q "AES note: built-in implementation." -
grep -q "AES note: using AESNI" ./programs/test/selftest
not grep -q "AES note: built-in implementation." ./programs/test/selftest
}
Expand Down Expand Up @@ -107,7 +107,7 @@ component_test_aesni_m32 () { # ~ 60s
make clean
make CC=gcc CFLAGS='-m32 -Werror -Wall -Wextra -mpclmul -msse2 -maes' LDFLAGS='-m32'
./programs/test/selftest aes | grep -q "AES note: using AESNI"
./programs/test/selftest aes | not grep -q "AES note: built-in implementation."
./programs/test/selftest aes | not grep -q "AES note: built-in implementation." -
grep -q "AES note: using AESNI" ./programs/test/selftest
not grep -q "AES note: built-in implementation." ./programs/test/selftest
not grep -q "AES note: using VIA Padlock" ./programs/test/selftest
Expand Down