diff options
author | Alessandro Ghedini <alessandro@ghedini.me> | 2015-10-06 12:23:42 -0400 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2015-10-06 12:30:47 -0400 |
commit | 2d2846237364671670c4b9a8415ea957887e1797 (patch) | |
tree | 4638d96264250b6104e5b156595814bb1a69a253 /test/packettest.c | |
parent | 20218b58b51b55189ada91807459d6bd64f5c986 (diff) | |
download | openssl-2d2846237364671670c4b9a8415ea957887e1797.tar.gz |
Fix travis builds on master
-Allow mingw debug builds to fail on Travis CI
-Fix Travis email notifications config
-Rename a variable to avoid a bogus warning with old GCC
error: declaration of ``dup'' shadows a global declaration [-Werror=shadow]
-Disable pedantic ms-format warnings with mingw
-Properly define const DH parameters
-Restore --debug flag in Travis CI builds; -d would get incorrectly passed
to ./Configure in mingw debug builds.
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'test/packettest.c')
-rw-r--r-- | test/packettest.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/packettest.c b/test/packettest.c index 915b42b129..edaa2824ba 100644 --- a/test/packettest.c +++ b/test/packettest.c @@ -242,16 +242,16 @@ static int test_PACKET_copy_bytes(unsigned char buf[BUF_LEN]) static int test_PACKET_copy_all(unsigned char buf[BUF_LEN]) { - unsigned char dup[BUF_LEN]; + unsigned char tmp[BUF_LEN]; PACKET pkt; size_t len; if ( !PACKET_buf_init(&pkt, buf, BUF_LEN) - || !PACKET_copy_all(&pkt, dup, BUF_LEN, &len) + || !PACKET_copy_all(&pkt, tmp, BUF_LEN, &len) || len != BUF_LEN - || memcmp(buf, dup, BUF_LEN) != 0 + || memcmp(buf, tmp, BUF_LEN) != 0 || PACKET_remaining(&pkt) != BUF_LEN - || PACKET_copy_all(&pkt, dup, BUF_LEN - 1, &len)) { + || PACKET_copy_all(&pkt, tmp, BUF_LEN - 1, &len)) { fprintf(stderr, "test_PACKET_copy_bytes() failed\n"); return 0; } |