GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-22 04:28:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing some compilation issues of the C++ test cases on OSX.

Browse Source
This commit is contained in:
bubnikv 2019-10-15 18:38:40 +02:00
parent abe856f9fe
commit 72e99cf35f
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/fff_print/test_data.cpp
View File

@ -203,15 +203,21 @@ TriangleMesh mesh(TestMesh m)
return _mesh; return _mesh;
} }
static bool verbose_gcode()
{
const char *v = std::getenv("SLIC3R_TESTS_GCODE");
if (v == nullptr)
return false;
std::string s(v);
return s == "1" || s == "on" || s == "yes";
}
std::shared_ptr<Print> init_print(std::initializer_list<TestMesh> meshes, Slic3r::Model& model, std::shared_ptr<DynamicPrintConfig> _config, bool comments) std::shared_ptr<Print> init_print(std::initializer_list<TestMesh> meshes, Slic3r::Model& model, std::shared_ptr<DynamicPrintConfig> _config, bool comments)
{ {
std::shared_ptr<DynamicPrintConfig> config(Slic3r::DynamicPrintConfig::new_from_defaults()); std::shared_ptr<DynamicPrintConfig> config(Slic3r::DynamicPrintConfig::new_from_defaults());
config->apply(*_config); config->apply(*_config);
const char* v {std::getenv("SLIC3R_TESTS_GCODE")}; if (verbose_gcode())
auto tests_gcode {(v == nullptr ? "" : std::string(v))};
if (tests_gcode != "")
config->set_key_value("gcode_comments", new ConfigOptionBool(true)); config->set_key_value("gcode_comments", new ConfigOptionBool(true));
std::shared_ptr<Print> print {std::make_shared<Slic3r::Print>()}; std::shared_ptr<Print> print {std::make_shared<Slic3r::Print>()};
@ -241,10 +247,7 @@ std::shared_ptr<Print> init_print(std::initializer_list<TriangleMesh> meshes, Sl
std::shared_ptr<DynamicPrintConfig> config(Slic3r::DynamicPrintConfig::new_from_defaults()); std::shared_ptr<DynamicPrintConfig> config(Slic3r::DynamicPrintConfig::new_from_defaults());
config->apply(*_config); config->apply(*_config);
const char* v {std::getenv("SLIC3R_TESTS_GCODE")}; if (verbose_gcode())
auto tests_gcode {(v == nullptr ? "" : std::string(v))};
if (tests_gcode != "")
config->set_key_value("gcode_comments", new ConfigOptionBool(true)); config->set_key_value("gcode_comments", new ConfigOptionBool(true));
std::shared_ptr<Print> print { std::make_shared<Slic3r::Print>() }; std::shared_ptr<Print> print { std::make_shared<Slic3r::Print>() };

6
tests/fff_print/test_flow.cpp
View File

@ -28,11 +28,11 @@ SCENARIO("Extrusion width specifics", "[!mayfail]") {
WHEN("first layer width set to 2mm") { WHEN("first layer width set to 2mm") {
Slic3r::Model model; Slic3r::Model model;
config->set_deserialize("first_layer_extrusion_width", "2"); config->set_deserialize("first_layer_extrusion_width", "2");
auto print {Slic3r::Test::init_print({TestMesh::cube_20x20x20}, model, config)}; std::shared_ptr<Print> print = Slic3r::Test::init_print({TestMesh::cube_20x20x20}, model, config);
std::vector<double> E_per_mm_bottom; std::vector<double> E_per_mm_bottom;
std::string gcode = ::Test::gcode(print); std::string gcode = Test::gcode(print);
auto parser {Slic3r::GCodeReader()}; Slic3r::GCodeReader parser;
const auto layer_height { config->opt_float("layer_height") }; const auto layer_height { config->opt_float("layer_height") };
parser.parse_buffer(gcode, [&E_per_mm_bottom, layer_height] (Slic3r::GCodeReader& self, const Slic3r::GCodeReader::GCodeLine& line) parser.parse_buffer(gcode, [&E_per_mm_bottom, layer_height] (Slic3r::GCodeReader& self, const Slic3r::GCodeReader::GCodeLine& line)
{ {