Various tests fixes

nemothenoone · nemothenoone · commit c488834838e3 · 2018-06-19T02:02:54.000+03:00
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -7,17 +7,17 @@ set(SKIP_TESTS)
 
 if(DEFINED ENV{APPVEYOR})
     list(APPEND SKIP_TESTS
-        pass-basic
-        pass-simplecustomname
-        pass-simplenamespace
-        pass-simple-test
-    )
+         pass-basic
+         pass-simplecustomname
+         pass-simplenamespace
+         pass-simple-test
+         )
 endif()
 
 function(create_test NAME TEST)
     set(CONTEXT)
     # get_cmake_property(VARS VARIABLES)
-    foreach (VAR_NAME CMAKE_TOOLCHAIN_FILE CMAKE_CROSSCOMPILING)
+    foreach(VAR_NAME CMAKE_TOOLCHAIN_FILE CMAKE_CROSSCOMPILING)
         list(APPEND CONTEXT -D${VAR_NAME}=${${VAR_NAME}})
     endforeach()
     add_custom_target(${NAME} COMMAND ${CMAKE_COMMAND} ${CONTEXT} -P ${CMAKE_CURRENT_SOURCE_DIR}/test.cmake ${TEST} ${CMAKE_CURRENT_BINARY_DIR}/tmp/${NAME})
diff --git a/test/basicapp/CMakeLists.txt b/test/basicapp/CMakeLists.txt
@@ -1,12 +1,12 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required(VERSION 3.5)
 project(basicapp)
 
 find_package(BCM)
 
 include(BCMInstallTargets)
 include(BCMDeploy)
 include(BCMTest)
-include(BCMSetupVersion) if(CMAKE_SOURCES_DIR)     set(CURRENT_SOURCES_DIR ${CMAKE_SOURCES_DIR}/libs/${CURRENT_PROJECT_NAME}) endif()
+include(BCMSetupVersion)
 
 cm_setup_version(VERSION 1.0)
 
diff --git a/test/basicapp/main.cpp b/test/basicapp/main.cpp
@@ -1,8 +1,6 @@
-
 #include <simpleversion.hpp>
 #include <simple.h>
 
-int main()
-{
-    simple();   
+int main() {
+    simple();
 }
diff --git a/test/checkprop/CMakeLists.txt b/test/checkprop/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required(VERSION 3.5)
 project(checkprop)
 
 find_package(BCM)
diff --git a/test/findpackagecheck/CMakeLists.txt b/test/findpackagecheck/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required(VERSION 3.5)
 project(findpackagecheck)
 
 message(STATUS "PKG: ${PKG}")
diff --git a/test/findpackagecheck/main.cpp.in b/test/findpackagecheck/main.cpp.in
@@ -1,4 +1,3 @@
-
 #include <@PKG_HEADER@>
 
 int main() {
diff --git a/test/libbasic/CMakeLists.txt b/test/libbasic/CMakeLists.txt
@@ -1,12 +1,12 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required(VERSION 3.5)
 project(basic)
 
 find_package(BCM)
 
 include(BCMInstallTargets)
 include(BCMDeploy)
 include(BCMTest)
-include(BCMSetupVersion) if(CMAKE_SOURCES_DIR)     set(CURRENT_SOURCES_DIR ${CMAKE_SOURCES_DIR}/libs/${CURRENT_PROJECT_NAME}) endif()
+include(BCMSetupVersion)
 
 cm_setup_version(VERSION 1.0)
 
diff --git a/test/libbasic/main.cpp b/test/libbasic/main.cpp
@@ -1,8 +1,6 @@
-
 #include <simpleversion.hpp>
 #include <simple.h>
 
-inline void basic()
-{
-    simple();   
+inline void basic() {
+    simple();
 }
diff --git a/test/libbasic/test.cpp b/test/libbasic/test.cpp
@@ -1,2 +1,2 @@
-
-int main() {}
+int main() {
+}
diff --git a/test/libbasicnamespace/CMakeLists.txt b/test/libbasicnamespace/CMakeLists.txt
@@ -1,12 +1,12 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required(VERSION 3.5)
 project(basic)
 
 find_package(BCM)
 
 include(BCMInstallTargets)
 include(BCMDeploy)
 include(BCMTest)
-include(BCMSetupVersion) if(CMAKE_SOURCES_DIR)     set(CURRENT_SOURCES_DIR ${CMAKE_SOURCES_DIR}/libs/${CURRENT_PROJECT_NAME}) endif()
+include(BCMSetupVersion)
 
 cm_setup_version(VERSION 1.0)
 
diff --git a/test/libbasicnamespace/main.cpp b/test/libbasicnamespace/main.cpp
@@ -1,7 +1,5 @@
-
 #include <simple.h>
 
-inline void basic()
-{
-    simple();   
+inline void basic() {
+    simple();
 }
diff --git a/test/libbasicnamespace/test.cpp b/test/libbasicnamespace/test.cpp
@@ -1,2 +1,2 @@
-
-int main() {}
+int main() {
+}
diff --git a/test/libsimple/CMakeLists.txt b/test/libsimple/CMakeLists.txt
@@ -1,11 +1,11 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required(VERSION 3.5)
 project(simple)
 
 find_package(BCM)
 
 include(BCMInstallTargets)
 include(BCMDeploy)
-include(BCMSetupVersion) if(CMAKE_SOURCES_DIR)     set(CURRENT_SOURCES_DIR ${CMAKE_SOURCES_DIR}/libs/${CURRENT_PROJECT_NAME}) endif()
+include(BCMSetupVersion)
 include(BCMTest)
 include(BCMPkgConfig)
 
@@ -18,7 +18,7 @@ target_include_directories(simple INTERFACE $<INSTALL_INTERFACE:$<INSTALL_PREFIX
 target_compile_definitions(simple INTERFACE -DSOME_DEFINE=1 -DHAS_SIMPLE=1 -DDEFINE_3=3)
 target_link_libraries(simple INTERFACE Threads::Threads)
 if(NOT MSVC)
-target_compile_options(simple INTERFACE -std=c++0x)
+    target_compile_options(simple INTERFACE -std=c++0x)
 endif()
 cm_test_link_libraries(simple)
 install(FILES test.cpp DESTINATION include2)
diff --git a/test/libsimple/compiletest.cpp b/test/libsimple/compiletest.cpp
@@ -1,8 +1,7 @@
 #include <simple.h>
 #include <cstdlib>
 
-int main()
-{
+int main() {
     std::abort();
-    simple();   
+    simple();
 }
diff --git a/test/libsimple/compiletestwillfail.cpp b/test/libsimple/compiletestwillfail.cpp
@@ -1,7 +1,6 @@
 #include <simple.h>
 #include <cstdlib>
 
-int main()
-{
-    static_assert(false, "Error") ;
+int main() {
+    static_assert(false, "Error");
 }
diff --git a/test/libsimple/include/simple.h b/test/libsimple/include/simple.h
@@ -1,19 +1,20 @@
-
 #ifndef GUARD_SIMPLE_H
 #define GUARD_SIMPLE_H
 
 #ifndef __MINGW32__
+
 #include <thread>
+
 #endif
 
-#if !defined(HAS_SIMPLE) || DEFINE_3 !=3
+#if !defined(HAS_SIMPLE) || DEFINE_3 != 3
 #error "Not configured"
 #endif
 
-inline void simple()
-{
+inline void simple() {
 #ifndef __MINGW32__
-    std::thread([]{}).join();
+    std::thread([] {
+    }).join();
 #endif
 }
 
diff --git a/test/libsimple/test.cpp b/test/libsimple/test.cpp
@@ -1,7 +1,5 @@
-
 #include <simple.h>
 
-int main()
-{
-    simple();   
+int main() {
+    simple();
 }
diff --git a/test/libsimple/testwillfail.cpp b/test/libsimple/testwillfail.cpp
@@ -1,8 +1,6 @@
-
 #include <simple.h>
 #include <cstdlib>
 
-int main()
-{
+int main() {
     return 1;
 }
diff --git a/test/libsimplecustomname/CMakeLists.txt b/test/libsimplecustomname/CMakeLists.txt
@@ -1,11 +1,11 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required(VERSION 3.5)
 project(libsimple)
 
 find_package(BCM)
 
 include(BCMInstallTargets)
 include(BCMDeploy)
-include(BCMSetupVersion) if(CMAKE_SOURCES_DIR)     set(CURRENT_SOURCES_DIR ${CMAKE_SOURCES_DIR}/libs/${CURRENT_PROJECT_NAME}) endif()
+include(BCMSetupVersion)
 include(BCMTest)
 
 cm_setup_version(VERSION 1.0 GENERATE_HEADER simpleversion.hpp)
diff --git a/test/libsimplecustomname/compiletest.cpp b/test/libsimplecustomname/compiletest.cpp
@@ -1,8 +1,7 @@
 #include <simple.h>
 #include <cstdlib>
 
-int main()
-{
+int main() {
     std::abort();
-    simple();   
+    simple();
 }
diff --git a/test/libsimplecustomname/include/simple.h b/test/libsimplecustomname/include/simple.h
@@ -1,9 +1,7 @@
-
 #ifndef GUARD_SIMPLE_H
 #define GUARD_SIMPLE_H
 
-inline void simple()
-{
+inline void simple() {
 }
 
 
diff --git a/test/libsimplecustomname/test.cpp b/test/libsimplecustomname/test.cpp
@@ -1,7 +1,5 @@
-
 #include <simple.h>
 
-int main()
-{
-    simple();   
+int main() {
+    simple();
 }
diff --git a/test/libsimplenamespace/CMakeLists.txt b/test/libsimplenamespace/CMakeLists.txt
@@ -1,11 +1,11 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required(VERSION 3.5)
 project(simple)
 
 find_package(BCM)
 
 include(BCMInstallTargets)
 include(BCMDeploy)
-include(BCMSetupVersion) if(CMAKE_SOURCES_DIR)     set(CURRENT_SOURCES_DIR ${CMAKE_SOURCES_DIR}/libs/${CURRENT_PROJECT_NAME}) endif()
+include(BCMSetupVersion)
 include(BCMTest)
 
 cm_setup_version(VERSION 1.0)
diff --git a/test/libsimplenamespace/compiletest.cpp b/test/libsimplenamespace/compiletest.cpp
@@ -1,8 +1,7 @@
 #include <simple.h>
 #include <cstdlib>
 
-int main()
-{
+int main() {
     std::abort();
-    simple();   
+    simple();
 }
diff --git a/test/libsimplenamespace/include/simple.h b/test/libsimplenamespace/include/simple.h
@@ -1,13 +1,11 @@
-
 #ifndef GUARD_SIMPLE_H
 #define GUARD_SIMPLE_H
 
 #ifndef HAS_SIMPLE
 #error "Not configured"
 #endif
 
-inline void simple()
-{
+inline void simple() {
 }
 
 
diff --git a/test/libsimplenamespace/test.cpp b/test/libsimplenamespace/test.cpp
@@ -1,7 +1,5 @@
-
 #include <simple.h>
 
-int main()
-{
-    simple();   
+int main() {
+    simple();
 }
diff --git a/test/parseversion/CMakeLists.txt b/test/parseversion/CMakeLists.txt
@@ -1,11 +1,11 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required(VERSION 3.5)
 project(simple)
 
 find_package(BCM)
 
 include(BCMInstallTargets)
 include(BCMDeploy)
-include(BCMSetupVersion) if(CMAKE_SOURCES_DIR)     set(CURRENT_SOURCES_DIR ${CMAKE_SOURCES_DIR}/libs/${CURRENT_PROJECT_NAME}) endif()
+include(BCMSetupVersion)
 include(BCMTest)
 
 cm_setup_version(PARSE_HEADER include/version.h)
diff --git a/test/parseversion/compiletest.cpp b/test/parseversion/compiletest.cpp
@@ -1,8 +1,7 @@
 #include <simple.h>
 #include <cstdlib>
 
-int main()
-{
+int main() {
     std::abort();
-    simple();   
+    simple();
 }
diff --git a/test/parseversion/include/simple.h b/test/parseversion/include/simple.h
@@ -1,11 +1,9 @@
-
 #ifndef GUARD_SIMPLE_H
 #define GUARD_SIMPLE_H
 
 #include <version.h>
 
-inline void simple()
-{
+inline void simple() {
 }
 
 
diff --git a/test/parseversion/test.cpp b/test/parseversion/test.cpp
@@ -1,7 +1,5 @@
-
 #include <simple.h>
 
-int main()
-{
-    simple();   
+int main() {
+    simple();
 }
diff --git a/test/pass/defaultproperties.cmake b/test/pass/defaultproperties.cmake
@@ -1,8 +1,8 @@
 macro(check_prop PROP_NAME VAR_NAME PROP_VALUE)
-    build_dir(${TEST_DIR}/checkprop CMAKE_ARGS 
-        -D${VAR_NAME}=${PROP_VALUE} 
-        -DPROP_NAME=${PROP_NAME} 
-        -DPROP_VALUE=${PROP_VALUE})
+    build_dir(${TEST_DIR}/checkprop CMAKE_ARGS
+              -D${VAR_NAME}=${PROP_VALUE}
+              -DPROP_NAME=${PROP_NAME}
+              -DPROP_VALUE=${PROP_VALUE})
 endmacro()
 
 foreach(VALUE On Off 1 0)
diff --git a/test/pkgconfigcheck/CMakeLists.txt b/test/pkgconfigcheck/CMakeLists.txt
@@ -1,11 +1,11 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required(VERSION 3.5)
 project(pkgconfigcheck)
 
 find_package(BCM)
 
 include(BCMInstallTargets)
 include(BCMDeploy)
-include(BCMSetupVersion) if(CMAKE_SOURCES_DIR)     set(CURRENT_SOURCES_DIR ${CMAKE_SOURCES_DIR}/libs/${CURRENT_PROJECT_NAME}) endif()
+include(BCMSetupVersion)
 include(BCMTest)
 include(BCMPkgConfig)
 
diff --git a/test/properties/CMakeLists.txt b/test/properties/CMakeLists.txt
diff --git a/test/properties/include/simple.h b/test/properties/include/simple.h
diff --git a/test/properties/nowarnings.cpp b/test/properties/nowarnings.cpp
diff --git a/test/properties/rtti.cpp b/test/properties/rtti.cpp
diff --git a/test/properties/test.cpp b/test/properties/test.cpp
diff --git a/test/properties/throw.cpp b/test/properties/throw.cpp
diff --git a/test/properties/warnings.cpp b/test/properties/warnings.cpp
diff --git a/test/simpletest/CMakeLists.txt b/test/simpletest/CMakeLists.txt
diff --git a/test/simpletest/include/simple.h b/test/simpletest/include/simple.h
diff --git a/test/simpletest/simple.cpp b/test/simpletest/simple.cpp
diff --git a/test/simpletest/test.cpp b/test/simpletest/test.cpp
diff --git a/test/simpletest/test/test.cpp b/test/simpletest/test/test.cpp
diff --git a/test/superproject/CMakeLists.txt b/test/superproject/CMakeLists.txt
diff --git a/test/test.cmake b/test/test.cmake

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-cmake_minimum_required (VERSION 3.5)`
	`1`	`+cmake_minimum_required(VERSION 3.5)`
`2`	`2`	`project(checkprop)`
`3`	`3`
`4`	`4`	`find_package(BCM)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`#include <@PKG_HEADER@>`
`3`	`2`
`4`	`3`	`int main() {`
-Original file line number
+Diff line change
@@ @@ -1,2 +1,2 @@ @@
+-
 -int main() {}
 +int main() {
 +}