diff options
author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2017-05-08 14:26:36 -0700 |
---|---|---|
committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2017-05-08 14:26:36 -0700 |
commit | ffb8d9d7c0a2f9902335df2c88a9d4ec35e11175 (patch) | |
tree | 53c357fb3dfcac901d074beb26bf1b3febddb3c3 | |
parent | bf2dcb047bfc9f9e3800de6c9bc64d99d8245913 (diff) | |
download | nss-hg-ffb8d9d7c0a2f9902335df2c88a9d4ec35e11175.tar.gz |
Bug 1363213 - more, non-leaking mpi tests; run them on TC, r=ttaubert
Differential Revision: https://nss-review.dev.mozaws.net/D284
-rw-r--r-- | automation/taskcluster/graph/src/extend.js | 13 | ||||
-rw-r--r-- | gtests/freebl_gtest/mpi_unittest.cc | 46 | ||||
-rwxr-xr-x | tests/gtests/gtests.sh | 2 |
3 files changed, 57 insertions, 4 deletions
diff --git a/automation/taskcluster/graph/src/extend.js b/automation/taskcluster/graph/src/extend.js index 925d8eddf..8373c5e6b 100644 --- a/automation/taskcluster/graph/src/extend.js +++ b/automation/taskcluster/graph/src/extend.js @@ -455,6 +455,19 @@ async function scheduleTestBuilds(base, args = "") { symbol: "mpi", kind: "test" })); + queue.scheduleTask(merge(base, { + parent: task_build, + command: [ + "/bin/bash", + "-c", + "bin/checkout.sh && nss/automation/taskcluster/scripts/run_tests.sh" + ], + name: "Gtests", + symbol: "Gtest", + tests: "gtests", + cycle: "standard", + kind: "test" + })); return queue.submit(); } diff --git a/gtests/freebl_gtest/mpi_unittest.cc b/gtests/freebl_gtest/mpi_unittest.cc index d465d5c5a..1f769c014 100644 --- a/gtests/freebl_gtest/mpi_unittest.cc +++ b/gtests/freebl_gtest/mpi_unittest.cc @@ -40,16 +40,18 @@ class MPITest : public ::testing::Test { protected: void TestCmp(const std::string a_string, const std::string b_string, int result) { - mp_int a, b, c; + mp_int a, b; MP_DIGITS(&a) = 0; MP_DIGITS(&b) = 0; - MP_DIGITS(&c) = 0; ASSERT_EQ(MP_OKAY, mp_init(&a)); ASSERT_EQ(MP_OKAY, mp_init(&b)); mp_read_radix(&a, a_string.c_str(), 16); mp_read_radix(&b, b_string.c_str(), 16); EXPECT_EQ(result, mp_cmp(&a, &b)); + + mp_clear(&a); + mp_clear(&b); } }; @@ -58,7 +60,41 @@ TEST_F(MPITest, MpiCmp10Test) { TestCmp("1", "0", 1); } TEST_F(MPITest, MpiCmp00Test) { TestCmp("0", "0", 0); } TEST_F(MPITest, MpiCmp11Test) { TestCmp("1", "1", 0); } -TEST_F(MPITest, MpiCmpConstTest) { +TEST_F(MPITest, MpiCmpUnalignedTest) { + mp_int a, b, c; + MP_DIGITS(&a) = 0; + MP_DIGITS(&b) = 0; + MP_DIGITS(&c) = 0; + ASSERT_EQ(MP_OKAY, mp_init(&a)); + ASSERT_EQ(MP_OKAY, mp_init(&b)); + ASSERT_EQ(MP_OKAY, mp_init(&c)); + + mp_read_radix(&a, "ffffffffffffffff3b4e802b4e1478", 16); + mp_read_radix(&b, "ffffffffffffffff3b4e802b4e1478", 16); + EXPECT_EQ(0, mp_cmp(&a, &b)); + + // Now change a and b such that they contain the same numbers but are not + // aligned. + // a = ffffffffffffff|ff3b4e802b4e1478 + // b = ffffffffffffffff|3b4e802b4e1478 + MP_DIGITS(&b)[0] &= 0x00ffffffffffffff; + MP_DIGITS(&b)[1] = 0xffffffffffffffff; + EXPECT_EQ(-1, mp_cmp(&a, &b)); + + ASSERT_EQ(MP_OKAY, mp_sub(&a, &b, &c)); + char c_tmp[40]; + ASSERT_EQ(MP_OKAY, mp_toradix(&c, c_tmp, 16)); + ASSERT_TRUE(strncmp(c_tmp, "feffffffffffffff100000000000000", 31)); + + mp_clear(&a); + mp_clear(&b); + mp_clear(&c); +} + +// This test is slow. Disable it by default so we can run these tests on CI. +class DISABLED_MPITest : public ::testing::Test {}; + +TEST_F(DISABLED_MPITest, MpiCmpConstTest) { mp_int a, b, c; MP_DIGITS(&a) = 0; MP_DIGITS(&b) = 0; @@ -115,6 +151,10 @@ TEST_F(MPITest, MpiCmpConstTest) { ASSERT_EQ(1, r); } printf("time c: %u\n", time_c / runs); + + mp_clear(&a); + mp_clear(&b); + mp_clear(&c); } } // nss_test diff --git a/tests/gtests/gtests.sh b/tests/gtests/gtests.sh index 469953fd4..c37fc675f 100755 --- a/tests/gtests/gtests.sh +++ b/tests/gtests/gtests.sh @@ -83,7 +83,7 @@ gtest_cleanup() } ################## main ################################################# -GTESTS="prng_gtest der_gtest pk11_gtest util_gtest" +GTESTS="prng_gtest der_gtest pk11_gtest util_gtest freebl_gtest" SOURCE_DIR="$PWD"/../.. gtest_init $0 gtest_start |