From 0066fa015e3feac4b5b4303ae6cde3b478dafe0b Mon Sep 17 00:00:00 2001
From: Stefan Behnel <stefan_ml@behnel.de>
Date: Fri, 10 Aug 2018 11:54:31 +0200
Subject: [PATCH] Remove duplicated C compiler option from tests that is
 already set by the test runner via the cpp11 tag.

---
 tests/run/cpp_classes_def.pyx      | 3 +--
 tests/run/cpp_smart_ptr.pyx        | 1 -
 tests/run/cpp_stl_conversion.pyx   | 3 +--
 tests/run/cpp_stl_cpp11.pyx        | 1 -
 tests/run/cpp_stl_function.pyx     | 3 +--
 tests/run/cpp_stl_string_cpp11.pyx | 1 -
 6 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/tests/run/cpp_classes_def.pyx b/tests/run/cpp_classes_def.pyx
index 52a498faa..0377fc1f6 100644
--- a/tests/run/cpp_classes_def.pyx
+++ b/tests/run/cpp_classes_def.pyx
@@ -1,7 +1,6 @@
 # mode: run
-# tag: cpp, werror
+# tag: cpp, werror, cpp11
 # cython: experimental_cpp_class_def=True
-# distutils: extra_compile_args=-std=c++0x
 
 cdef double pi
 from math import pi
diff --git a/tests/run/cpp_smart_ptr.pyx b/tests/run/cpp_smart_ptr.pyx
index e6f2a53cc..7a249fbd3 100644
--- a/tests/run/cpp_smart_ptr.pyx
+++ b/tests/run/cpp_smart_ptr.pyx
@@ -1,6 +1,5 @@
 # mode: run
 # tag: cpp, werror, cpp11
-# distutils: extra_compile_args=-std=c++0x
 
 from libcpp.memory cimport unique_ptr, shared_ptr, default_delete, dynamic_pointer_cast
 from libcpp cimport nullptr
diff --git a/tests/run/cpp_stl_conversion.pyx b/tests/run/cpp_stl_conversion.pyx
index e22546a18..578915a0b 100644
--- a/tests/run/cpp_stl_conversion.pyx
+++ b/tests/run/cpp_stl_conversion.pyx
@@ -1,6 +1,5 @@
 # mode: run
-# tag: cpp, werror
-# distutils: extra_compile_args=-std=c++0x
+# tag: cpp, werror, cpp11
 
 import sys
 from libcpp.map cimport map
diff --git a/tests/run/cpp_stl_cpp11.pyx b/tests/run/cpp_stl_cpp11.pyx
index 8220d57ea..618e117f1 100644
--- a/tests/run/cpp_stl_cpp11.pyx
+++ b/tests/run/cpp_stl_cpp11.pyx
@@ -1,6 +1,5 @@
 # mode: run
 # tag: cpp, werror, cpp11
-# distutils: extra_compile_args=-std=c++0x
 
 import sys
 from libcpp.unordered_map cimport unordered_map
diff --git a/tests/run/cpp_stl_function.pyx b/tests/run/cpp_stl_function.pyx
index 6f7a532db..723773481 100644
--- a/tests/run/cpp_stl_function.pyx
+++ b/tests/run/cpp_stl_function.pyx
@@ -1,6 +1,5 @@
-# distutils: extra_compile_args=-std=c++0x
 # mode: run
-# tag: cpp
+# tag: cpp, cpp11
 
 from libcpp.functional cimport function
 cimport cpp_function_lib
diff --git a/tests/run/cpp_stl_string_cpp11.pyx b/tests/run/cpp_stl_string_cpp11.pyx
index bd8524c08..c8cc78593 100644
--- a/tests/run/cpp_stl_string_cpp11.pyx
+++ b/tests/run/cpp_stl_string_cpp11.pyx
@@ -1,6 +1,5 @@
 # mode: run
 # tag: cpp, werror, cpp11
-# distutils: extra_compile_args=-std=c++11
 
 from libcpp.string cimport string
 
-- 
2.30.9