Merge pull request ethereum#93 from ethereum/tests-cppstd

Compile unittests and vmtests as C++11
jwasinger · Aug 28, 2018 · 3076fc8 · 3076fc8
2 parents e34ea20 + 8108f04
commit 3076fc8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/circle.yml b/circle.yml
@@ -1,7 +1,7 @@
 version: 2
 jobs:
 
-  build:
+  build: &build
     docker:
       - image: ethereum/cpp-build-env
     steps:
@@ -46,6 +46,12 @@ jobs:
           name: "Run evmc-vmtester libevmc-examplevm.so"
           command: ~/install/bin/evmc-vmtester ~/install/lib/libevmc-examplevm.so
 
+  build-clang-3.8:
+    <<: *build
+    environment:
+      CC: clang-3.8
+      CXX: clang++-3.8
+
   test-docs:
     docker:
       - image: ethereum/cpp-build-env
@@ -105,6 +111,7 @@ workflows:
   evmc:
     jobs:
       - build
+      - build-clang-3.8
       - bindings-go-1.10
       - bindings-go-1.9
       - test-docs

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -5,6 +5,11 @@
 hunter_add_package(GTest)
 find_package(GTest CONFIG REQUIRED)
 
+if(NOT CMAKE_CXX_STANDARD)
+    set(CMAKE_CXX_STANDARD 11)
+    set(CMAKE_CXX_EXTENSIONS OFF)
+endif()
+
 add_subdirectory(integration)
 add_subdirectory(unittests)
 add_subdirectory(vmtester)