refactoring

This commit is contained in:
Nikolay Khabarov committed 2017-06-12 00:52:11 +03:00
1 parent 0fe98f4cca
commit 98bf7e914e
23 files changed
+448 -405

No files matched your search

+5 -5
View File
@@ -14,14 +14,14 @@ echo '---------------------------Unit tests---------------------------------'
python -m unittest discover "$@" --pattern="test_*.py"
echo '-------------------------Integration tests----------------------------'
app="pycnc"
if ! which $app &> /dev/null; then
if ! which ${app} &> /dev/null; then
echo "WARNING pycnc not found in path. Not installed? Using './pycnc'."
app="./pycnc"
fi
res="$($app tests/rects.gcode 2>&1)"
res="$res$($app tests/circles.gcode 2>&1)"
res="$res$($app tests/test_parser.gcode 2>&1)"
if echo "$res" | grep -q -i error; then
res="$(${app} tests/rects.gcode 2>&1)"
res="${res}$(${app} tests/circles.gcode 2>&1)"
res="${res}$(${app} tests/test_parser.gcode 2>&1)"
if echo "${res}" | grep -q -i error; then
echo "FAILED"
echo "$res"
exit 1