Updated

Author: polytypic

.cppsm

@@ -6,15 +6,18 @@ notifications:
 matrix:
   include:
     - os: linux
-      dist: trusty
+      dist: xenial
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-7
           packages:
             - g++-8
-            - clang-7
+      env:
+        - GNU_CC="gcc-8"
+        - GNU_CXX="g++-8"
+        - CLANG_CC="clang"
+        - CLANG_CXX="clang++"
     - os: osx
       osx_image: xcode10.2
     - os: windows

.travis.yml

@@ -1,2 +1 @@
-add_conventional_executable_test(dumpster_test)
-target_link_libraries(dumpster_test PRIVATE dumpster_v1 testing_v1)
+add_conventional_executable_tests(PRIVATE dumpster_v1 testing_v1)

equipment/testing.cpp/v1

@@ -4,19 +4,6 @@
 
 using namespace testing_v1;
 
-auto finally_lambda_test = test([]() {
-  bool finalized = false;
-  bool executed = false;
-
-  {
-    auto finalizer = dumpster_v1::finally([&]() { finalized = true; });
-    executed = !finalized;
-  }
-
-  verify(finalized);
-  verify(executed);
-});
-
 static bool s_finalized = false;
 static void s_function() { s_finalized = true; }
 

internals/CMakeLists.txt

@@ -0,0 +1,18 @@
+#include "dumpster_v1/finally.hpp"
+
+#include "testing_v1/test.hpp"
+
+using namespace testing_v1;
+
+auto finally_lambda_test = test([]() {
+  bool finalized = false;
+  bool executed = false;
+
+  {
+    auto finalizer = dumpster_v1::finally([&]() { finalized = true; });
+    executed = !finalized;
+  }
+
+  verify(finalized);
+  verify(executed);
+});