From 005aa69c0a97edcc9e8eb887f8b4be8e090b8299 Mon Sep 17 00:00:00 2001
From: Peter Conrad <conrad@quisquis.de>
Date: Mon, 18 Nov 2019 14:03:07 +0100
Subject: [PATCH] Attempt to fix tests

---
 .github/workflows/build-and-test.yml | 4 ++--
 tests/crypto/dh_test.cpp             | 2 +-
 tests/stacktrace_test.cpp            | 9 +++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 56b1cd4..c346f5e 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -56,7 +56,7 @@ jobs:
       run: |
         parallel echo Running {}\; sh -c "_build/tests/{}" <<_EOT_
         all_tests
-        bloom_test README.md
+        bloom_test -- README.md
         ecc_test README.md
         hmac_test
         task_cancel_test
@@ -114,7 +114,7 @@ jobs:
       run: |
         parallel echo Running {}\; sh -c "_build/tests/{}" <<_EOT_
         all_tests
-        bloom_test README.md
+        bloom_test -- README.md
         ecc_test README.md
         hmac_test
         task_cancel_test
diff --git a/tests/crypto/dh_test.cpp b/tests/crypto/dh_test.cpp
index bc38cc4..a6d9d25 100644
--- a/tests/crypto/dh_test.cpp
+++ b/tests/crypto/dh_test.cpp
@@ -50,7 +50,7 @@ BOOST_AUTO_TEST_CASE(dh_test)
     alice.p.clear(); alice.p.push_back(100); alice.p.push_back(2);
     BOOST_CHECK( !alice.validate() );
     alice.p = bob.p;
-    alice.g = 9;
+    alice.g = 1;
     BOOST_CHECK( !alice.validate() );
 }
 
diff --git a/tests/stacktrace_test.cpp b/tests/stacktrace_test.cpp
index 452a63e..feb5790 100644
--- a/tests/stacktrace_test.cpp
+++ b/tests/stacktrace_test.cpp
@@ -64,17 +64,18 @@ public:
 BOOST_AUTO_TEST_CASE(static_variant_depth_test)
 {
    int64_t i = 1;
-   fc::static_variant<uint8_t,uint16_t,uint32_t,uint64_t,int8_t,int16_t,int32_t,int64_t> test(i);
+   fc::static_variant<std::string,std::vector<uint8_t>,std::vector<uint16_t>,std::vector<uint32_t>,
+                      uint8_t,uint16_t,uint32_t,uint64_t,int8_t,int16_t,int32_t,int64_t> test(i);
 
    std::string stacktrace = test.visit( _svdt_visitor() );
-   //std::cerr << stacktrace << "\n";
+   std::cerr << stacktrace << "\n";
    std::vector<std::string> lines;
    boost::split( lines, stacktrace, boost::is_any_of("\n") );
    int count = 0;
    for( const auto& line : lines )
       if( line.find("_svdt_visitor") != std::string::npos ) count++;
-   BOOST_CHECK_LT( 2, count ); // test.visit(), static_variant::visit, function object, visitor
-   BOOST_CHECK_GT( 8, count ); // some is implementation-dependent
+   BOOST_CHECK_LT( 1, count );  // The actual count depends on compiler and optimization settings.
+   BOOST_CHECK_GT( 10, count ); // It *should* be less than the number of static variant components.
 }
 #endif