From 479527bb9224e250f5c69beca09c9d58e26981a5 Mon Sep 17 00:00:00 2001 From: Pavel Belikov Date: Thu, 23 Nov 2017 19:49:39 +0300 Subject: fix coveralls --- .travis.yml | 2 +- CMakeLists.txt | 2 +- test/multiple_inclusion_1.cpp | 6 ------ test/multiple_inclusion_1.cxx | 6 ++++++ test/multiple_inclusion_2.cpp | 3 --- test/multiple_inclusion_2.cxx | 3 +++ 6 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 test/multiple_inclusion_1.cpp create mode 100644 test/multiple_inclusion_1.cxx delete mode 100644 test/multiple_inclusion_2.cpp create mode 100644 test/multiple_inclusion_2.cxx diff --git a/.travis.yml b/.travis.yml index d4892fe..efba6f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -145,6 +145,6 @@ before_install: - pip install --user cpp-coveralls after_success: - - if [ "${COVERAGE}" = 1 ]; then coveralls --root .. -E ".*catch.*" -E ".*CMakeFiles.*" -E ".*gitlike.cxx.*" -E ".*test.cxx.*"; fi + - if [ "${COVERAGE}" = 1 ]; then coveralls --root .. -E ".*catch.*" -E ".*CMakeFiles.*" -E ".*gitlike.cxx.*" -E ".*test.*"; fi diff --git a/CMakeLists.txt b/CMakeLists.txt index 24d4a08..322e8d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ else () target_compile_options(argstest PRIVATE -Wall -Wextra -Werror -pedantic -Wshadow -Wunused-parameter) endif () -add_executable(argstest-multiple-inclusion test/multiple_inclusion_1.cpp test/multiple_inclusion_2.cpp) +add_executable(argstest-multiple-inclusion test/multiple_inclusion_1.cxx test/multiple_inclusion_2.cxx) target_link_libraries(argstest-multiple-inclusion args) set_property(TARGET argstest-multiple-inclusion PROPERTY CXX_STANDARD 11) diff --git a/test/multiple_inclusion_1.cpp b/test/multiple_inclusion_1.cpp deleted file mode 100644 index b831d0a..0000000 --- a/test/multiple_inclusion_1.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int foo() { return 42; } -int bar(); - -int main() { return foo() - bar(); } diff --git a/test/multiple_inclusion_1.cxx b/test/multiple_inclusion_1.cxx new file mode 100644 index 0000000..b831d0a --- /dev/null +++ b/test/multiple_inclusion_1.cxx @@ -0,0 +1,6 @@ +#include + +int foo() { return 42; } +int bar(); + +int main() { return foo() - bar(); } diff --git a/test/multiple_inclusion_2.cpp b/test/multiple_inclusion_2.cpp deleted file mode 100644 index cdcb020..0000000 --- a/test/multiple_inclusion_2.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include - -int bar() { return 42; } diff --git a/test/multiple_inclusion_2.cxx b/test/multiple_inclusion_2.cxx new file mode 100644 index 0000000..cdcb020 --- /dev/null +++ b/test/multiple_inclusion_2.cxx @@ -0,0 +1,3 @@ +#include + +int bar() { return 42; } -- cgit v1.2.1