fix test (for real)

martinus · Jul 18, 2020 · f6894f3 · f6894f3
1 parent 500ceac
commit f6894f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/scripts/all.sh b/src/scripts/all.sh
@@ -17,8 +17,8 @@ function build() {
 
     DIRNAME=${COMPILER}_cxx${CXX_STANDARD}_sanitizer${SANITIZER}_${CXXFLAGS}
 
-    rm -Rf ${DIRNAME}
     mkdir -p ${DIRNAME}
+    rm -f ${DIRNAME}/CMakeCache.txt
     cd ${DIRNAME}
 
     CXX=$(which ${COMPILER}) cmake -G Ninja -DCMAKE_CXX_FLAGS=${CXXFLAGS} -DCMAKE_BUILD_TYPE=Debug -DRH_cxx_standard=${CXX_STANDARD} -DRH_sanitizer=${SANITIZER} ${ROOTDIR}

diff --git a/src/test/unit/unit_hash_smart_ptr.cpp b/src/test/unit/unit_hash_smart_ptr.cpp
@@ -11,17 +11,13 @@ void check(Ptr const& ptr) {
 }
 
 TEST_CASE("unit_hash_smart_ptr") {
-#if ROBIN_HOOD(CXX) >= ROBIN_HOOD(CXX14)
     check(std::unique_ptr<uint64_t>{});
-    check(std::make_unique<uint64_t>(123));
-
     check(std::shared_ptr<uint64_t>{});
     check(std::make_shared<uint64_t>(123));
+
+#if ROBIN_HOOD(CXX) >= ROBIN_HOOD(CXX14)
+    check(std::make_unique<uint64_t>(123));
 #else
-    check(std::unique_ptr<uint64_t>{});
     check(std::unique_ptr<uint64_t>{new uint64_t{123}});
-
-    check(std::shared_ptr<uint64_t>{});
-    check(std::shared_ptr<uint64_t>{new uint64_t{123}});
 #endif
 }