Add skip_on_server. Provide a compiler for ninja tests.

egorpugin · egorpugin · commit 50130215ac91 · 2018-04-01T19:11:24.000+03:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -154,7 +154,7 @@ cppan_add_package(
         pvt.cppan.demo.giovannidicanio.winreg-master
         pvt.cppan.demo.mpark.variant-1
 
-        pvt.cppan.demo.philsquared.catch-1
+        pvt.cppan.demo.catchorg.catch2-1
 )
 cppan_execute()
 
diff --git a/src/common/checks.h b/src/common/checks.h
@@ -87,8 +87,8 @@ class Check
     using Value = int;
 
 public:
-    Check(const Information &i, const CheckParameters &parameters = CheckParameters());
-    virtual ~Check() {}
+    Check(Information i, const CheckParameters &parameters = CheckParameters());
+    virtual ~Check() = default;
 
     const Information &getInformation() const { return information; }
     String getVariable() const { return variable; }
diff --git a/src/common/project.cpp b/src/common/project.cpp
@@ -854,7 +854,8 @@ void Project::load(const yaml &root)
     YAML_EXTRACT_AUTO(export_all_symbols);
     YAML_EXTRACT_AUTO(export_if_static);
     YAML_EXTRACT_AUTO(rc_enabled);
-    YAML_EXTRACT_AUTO(disabled);
+    //YAML_EXTRACT_AUTO(disabled);
+    YAML_EXTRACT_AUTO(skip_on_server);
     YAML_EXTRACT_AUTO(build_dependencies_with_same_config);
 
     api_name = get_sequence_set<String>(root, "api_name");
@@ -1472,7 +1473,8 @@ yaml Project::save() const
     ADD_IF_VAL_TRIPLE(export_all_symbols);
     ADD_IF_VAL_TRIPLE(export_if_static);
     ADD_IF_NOT_VAL_TRIPLE(rc_enabled);
-    ADD_IF_VAL_TRIPLE(disabled);
+    //ADD_IF_VAL_TRIPLE(disabled);
+    ADD_IF_VAL_TRIPLE(skip_on_server);
     ADD_IF_VAL_TRIPLE(build_dependencies_with_same_config);
 
     ADD_SET(api_name, api_name);
diff --git a/src/common/project.h b/src/common/project.h
@@ -240,7 +240,8 @@ struct Project
     bool export_if_static = false;
     bool build_dependencies_with_same_config = false;
     bool rc_enabled = true;
-    bool disabled = false;
+    //bool disabled = false;
+    bool skip_on_server = false;
 
     StringSet api_name;
     String output_name; // file name
diff --git a/src/common/yaml.cpp b/src/common/yaml.cpp
@@ -178,6 +178,7 @@ String dump_yaml_config(const yaml &root)
         "rc_enabled",
         "build_dependencies_with_same_config",
         "disabled",
+        "skip_on_server",
 
         "api_name",
 
diff --git a/src/printers/cmake.cpp b/src/printers/cmake.cpp
@@ -972,7 +972,7 @@ add_custom_command(TARGET )" + target + R"( POST_BUILD
 
             ScopedDependencyCondition sdc(ctx, p);
             ctx.addLine("get_target_property(imploc_" + p.variable_name + " " + p.target_name + " IMPORTED_LOCATION_${CMAKE_BUILD_TYPE_UPPER})");
-            
+
             // FIXME: on apple some targets fail to find above var
             //ctx.if_("\"${imploc_" + p.variable_name + "}\" STREQUAL \"imploc_" + p.variable_name + "-NOTFOUND\"");
             //ctx.addLine("set(imploc_" + p.variable_name + ")");
diff --git a/test/run/CMakeLists.txt b/test/run/CMakeLists.txt
@@ -34,22 +34,20 @@ endmacro()
 
 macro(cppan_add_test_bdir name type)
     cppan_add_test(${name} ${type} $<TARGET_FILE:client> -d ${bdir} ${ARGN})
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${name}.yml ${bdir}/cppan.yml)
 endmacro()
 
 macro(cppan_add_test_simple name)
     set(type simple)
     set_bdir(${name} ${type})
     cppan_add_test_bdir(${name} ${type})
-
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${name}.yml ${bdir}/cppan.yml)
 endmacro()
 
 macro(cppan_add_test_generate name)
     set(type generate)
     set_bdir(${name} ${type})
     cppan_add_test_bdir(${name} ${type} --generate .)
 
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${name}.yml ${bdir}/cppan.yml)
     file(WRITE ${bdir}/dummy.cpp "int main(){}")
 endmacro()
 
@@ -58,7 +56,6 @@ macro(cppan_add_test_build name)
     set_bdir(${name} ${type})
     cppan_add_test_bdir(${name} ${type} --build .)
 
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${name}.yml ${bdir}/cppan.yml)
     file(WRITE ${bdir}/dummy.cpp "int main(){}")
 endmacro()
 
@@ -77,6 +74,9 @@ cppan_add_test_suite(dep_in_dep_png_nanobp_no_cache)
 find_program(n ninja)
 find_program(nb ninja-build)
 if (NOT WIN32 AND NOT ("${n}" STREQUAL "n-NOTFOUND" AND "${nb}" STREQUAL "nb-NOTFOUND"))
+if (WIN32)
+set(test_compiler "compiler: \"${CMAKE_CXX_COMPILER}\"")
+endif()
 cppan_add_test_suite(dep_in_dep_png_nanobp_ninja)
 # FIXME:
 #cppan_add_test_suite(dep_in_dep_png_nanobp_ninja_strict)
diff --git a/test/run/dep_in_dep_png_nanobp_ninja.yml b/test/run/dep_in_dep_png_nanobp_ninja.yml
@@ -1,6 +1,7 @@
 local_settings:
     storage_dir: storage
     build:
+        ${test_compiler}
         generator: Ninja
 
 projects:
diff --git a/test/run/dep_in_dep_png_nanobp_ninja_strict.yml b/test/run/dep_in_dep_png_nanobp_ninja_strict.yml
@@ -1,6 +1,7 @@
 local_settings:
     storage_dir: storage
     build:
+        ${test_compiler}
         generator: Ninja
         additional_build_args:
             - -w
diff --git a/test/run/dep_in_dep_png_nanobp_no_cache_ninja.yml b/test/run/dep_in_dep_png_nanobp_no_cache_ninja.yml
@@ -2,6 +2,7 @@ local_settings:
     storage_dir: storage
     use_cache: false
     build:
+        ${test_compiler}
         generator: Ninja
 
 projects:
diff --git a/test/run/dep_in_dep_png_nanobp_no_cache_ninja_strict.yml b/test/run/dep_in_dep_png_nanobp_no_cache_ninja_strict.yml
@@ -2,6 +2,7 @@ local_settings:
     storage_dir: storage
     use_cache: false
     build:
+        ${test_compiler}
         generator: Ninja
         additional_build_args:
             - -w

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ cppan_add_package(`
`154`	`154`	`pvt.cppan.demo.giovannidicanio.winreg-master`
`155`	`155`	`pvt.cppan.demo.mpark.variant-1`
`156`	`156`
`157`		`- pvt.cppan.demo.philsquared.catch-1`
	`157`	`+ pvt.cppan.demo.catchorg.catch2-1`
`158`	`158`	`)`
`159`	`159`	`cppan_execute()`
`160`	`160`