3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

test_printgcode.cpp - trying to replace std::regex with boost::regex

Browse source 
as the std::regex is likely old or incorrect on our old debian/gcc
build server.
This commit is contained in:
bubnikv 2019-10-18 16:50:03 +02:00
parent d1a86e513c
commit f6057c1b4f
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
tests/fff_print/test_printgcode.cpp
View file

@ -6,14 +6,14 @@
#include "test_data.hpp" #include "test_data.hpp"
#include <algorithm> #include <algorithm>
#include <regex> #include <boost/regex.hpp>
using namespace Slic3r; using namespace Slic3r;
using namespace Slic3r::Test; using namespace Slic3r::Test;
std::regex perimeters_regex("G1 X[-0-9.]* Y[-0-9.]* E[-0-9.]* ; perimeter"); boost::regex perimeters_regex("G1 X[-0-9.]* Y[-0-9.]* E[-0-9.]* ; perimeter");
std::regex infill_regex("G1 X[-0-9.]* Y[-0-9.]* E[-0-9.]* ; infill"); boost::regex infill_regex("G1 X[-0-9.]* Y[-0-9.]* E[-0-9.]* ; infill");
std::regex skirt_regex("G1 X[-0-9.]* Y[-0-9.]* E[-0-9.]* ; skirt"); boost::regex skirt_regex("G1 X[-0-9.]* Y[-0-9.]* E[-0-9.]* ; skirt");
SCENARIO( "PrintGCode basic functionality", "[PrintGCode]") { SCENARIO( "PrintGCode basic functionality", "[PrintGCode]") {
GIVEN("A default configuration and a print test object") { GIVEN("A default configuration and a print test object") {
@ -61,16 +61,16 @@ SCENARIO( "PrintGCode basic functionality", "[PrintGCode]") {
REQUIRE(gcode.find("; fill_density") != std::string::npos); REQUIRE(gcode.find("; fill_density") != std::string::npos);
} }
THEN("Infill is emitted.") { THEN("Infill is emitted.") {
std::smatch has_match; boost::smatch has_match;
REQUIRE(std::regex_search(gcode, has_match, infill_regex)); REQUIRE(boost::regex_search(gcode, has_match, infill_regex));
} }
THEN("Perimeters are emitted.") { THEN("Perimeters are emitted.") {
std::smatch has_match; boost::smatch has_match;
REQUIRE(std::regex_search(gcode, has_match, perimeters_regex)); REQUIRE(boost::regex_search(gcode, has_match, perimeters_regex));
} }
THEN("Skirt is emitted.") { THEN("Skirt is emitted.") {
std::smatch has_match; boost::smatch has_match;
REQUIRE(std::regex_search(gcode, has_match, skirt_regex)); REQUIRE(boost::regex_search(gcode, has_match, skirt_regex));
} }
THEN("final Z height is 20mm") { THEN("final Z height is 20mm") {
double final_z = 0.0; double final_z = 0.0;
@ -100,16 +100,16 @@ SCENARIO( "PrintGCode basic functionality", "[PrintGCode]") {
REQUIRE(gcode.size() > 0); REQUIRE(gcode.size() > 0);
} }
THEN("Infill is emitted.") { THEN("Infill is emitted.") {
std::smatch has_match; boost::smatch has_match;
REQUIRE(std::regex_search(gcode, has_match, infill_regex)); REQUIRE(boost::regex_search(gcode, has_match, infill_regex));
} }
THEN("Perimeters are emitted.") { THEN("Perimeters are emitted.") {
std::smatch has_match; boost::smatch has_match;
REQUIRE(std::regex_search(gcode, has_match, perimeters_regex)); REQUIRE(boost::regex_search(gcode, has_match, perimeters_regex));
} }
THEN("Skirt is emitted.") { THEN("Skirt is emitted.") {
std::smatch has_match; boost::smatch has_match;
REQUIRE(std::regex_search(gcode, has_match, skirt_regex)); REQUIRE(boost::regex_search(gcode, has_match, skirt_regex));
} }
THEN("Between-object-gcode is emitted.") { THEN("Between-object-gcode is emitted.") {
REQUIRE(gcode.find("; between-object-gcode") != std::string::npos); REQUIRE(gcode.find("; between-object-gcode") != std::string::npos);